Correctly tokenize output to admin clients.

[tripe] / tun-slip.c

diff --git a/tun-slip.c b/tun-slip.c
index 2b74a77406ae9434e6fc5dfd6b316e65505a51d5..2efda8900e03be73b5a344ee6c553490f3740a07 100644 (file)
--- a/tun-slip.c
+++ b/tun-slip.c
@@ -100,11 +100,11 @@ static void t_read(int fd, unsigned mode, void *v)
 #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;
@@ -126,7 +126,7 @@ static void t_read(int fd, unsigned mode, void *v)
        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, "tun-slip: empty packet"); )
        } else {
@@ -143,7 +143,7 @@ static void t_read(int fd, unsigned mode, void *v)
        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;
@@ -158,7 +158,7 @@ static void t_read(int fd, unsigned mode, void *v)
        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:
@@ -166,7 +166,7 @@ static void t_read(int fd, unsigned mode, void *v)
          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;
          }
        }
@@ -282,18 +282,18 @@ static tunnel *t_create(peer *p)
   /* --- 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) {
@@ -313,7 +313,7 @@ static tunnel *t_create(peer *p)
   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')