Allow admin clients to filter out async messages. Send notifications

[tripe] / peer.c

diff --git a/peer.c b/peer.c
index 87ea4e9e6d36856ad71ecabbbe2d85edbcaedbc0..1469a3a86340995a4baa6340d46821e1d6977e0f 100644 (file)
--- a/peer.c
+++ b/peer.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: peer.c,v 1.11 2004/04/08 01:36:17 mdw Exp $
+ * $Id$
  *
  * Communication with the peer
  *
@@ -63,7 +63,7 @@ static void p_read(int fd, unsigned mode, void *v)
   sz = sizeof(addr);
   n = recvfrom(fd, buf_i, sizeof(buf_i), 0, &a.sa, &sz);
   if (n < 0) {
-    a_warn("error reading socket: %s", strerror(errno));
+    a_warn("PEER - socket-read-error -- %s", strerror(errno));
     return;
   }
 
@@ -75,8 +75,8 @@ static void p_read(int fd, unsigned mode, void *v)
        p->peer.sin.sin_port == a.sin.sin_port)
       goto found;
   }
-  a_warn("packet from unexpected peer: %s:%u",
-       inet_ntoa(a.sin.sin_addr), (unsigned)ntohs(a.sin.sin_port));
+  a_warn("PEER - unexpected-source INET %s %u",
+        inet_ntoa(a.sin.sin_addr), (unsigned)ntohs(a.sin.sin_port));
   return;
 
 found:
@@ -90,20 +90,20 @@ found:
   p->st.sz_in += n;
   buf_init(&b, buf_i, n);
   if ((ch = buf_getbyte(&b)) < 0) {
-    a_warn("bad packet from `%s': no type byte", p->name);
+    a_warn("PEER %s bad-packet no-type", p->name);
     return;
   }
   switch (ch & MSG_CATMASK) {
     case MSG_PACKET:
       if (ch & MSG_TYPEMASK) {
-       a_warn("unknown packet type from `%s'", p->name);
+       a_warn("PEER %s bad-packet unknown-type 0x%02x", p->name, ch);
        p->st.n_reject++;
        return;
       }
       buf_init(&bb, buf_o, sizeof(buf_o));
       if (ksl_decrypt(&p->ks, MSG_PACKET, &b, &bb)) {
        p->st.n_reject++;
-       a_warn("couldn't decrypt inbound packet from `%s'", p->name);
+       a_warn("PEER %s decrypt-failed", p->name);
        return;
       }
       if (BOK(&bb)) {
@@ -112,7 +112,7 @@ found:
        tun_inject(&p->t, &bb);
       } else {
        p->st.n_reject++;
-       a_warn("packet build failed");
+       a_warn("PEER %s packet-build-failed", p->name);
       }
       break;
     case MSG_KEYEXCH:
@@ -120,7 +120,7 @@ found:
       break;
     default:
       p->st.n_reject++;
-      a_warn("bad packet from `%s': unknown packet type", p->name);
+      a_warn("PEER %s bad-packet unknown-category 0x%02x", p->name, ch);
       break;
   }
 }
@@ -155,14 +155,14 @@ buf *p_txstart(peer *p, unsigned msg)
 void p_txend(peer *p)
 {
   if (!BOK(&p->b)) {
-    a_warn("packet build failed");
+    a_warn("PEER %s packet-build-failed", p->name);
     return;
   }
   IF_TRACING(T_PEER, trace_block(T_PACKET, "peer: sending packet",
                                 BBASE(&p->b), BLEN(&p->b)); )
   if (sendto(sock.fd, BBASE(&p->b), BLEN(&p->b),
             0, &p->peer.sa, p->sasz) < 0)
-    a_warn("packet send to `%s' failed: %s", p->name, strerror(errno));
+    a_warn("PEER %s socket-write-error -- %s", p->name, strerror(errno));
   else {
     p->st.n_out++;
     p->st.sz_out += BLEN(&p->b);
@@ -335,6 +335,17 @@ peer *p_create(const char *name, struct sockaddr *sa, size_t sz)
   if (peers)
     peers->prev = p;
   peers = p;
+  switch (p->peer.sa.sa_family) {
+    case AF_INET:
+      a_notify("ADD %s INET %s %u",
+              name,
+              inet_ntoa(p->peer.sin.sin_addr),
+              (unsigned)ntohs(p->peer.sin.sin_port));
+      break;
+    default:
+      a_notify("ADD %s UNKNOWN", name);
+      break;
+  }
   return (p);
 
 tidy_1:
@@ -385,6 +396,7 @@ peer *p_find(const char *name)
 void p_destroy(peer *p)
 {
   T( trace(T_PEER, "peer: destroying peer `%s'", p->name); )
+  a_notify("KILL %s", p->name);
   ksl_free(&p->ks);
   kx_free(&p->kx);
   tun_destroy(&p->t);