X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/767b36e286295b8572933487b31ceb301e0a43f9..0e6502d3341dd870293dacc1aafea005c6dadf0d:/peer.c diff --git a/peer.c b/peer.c index 9a2fc591..402d08b5 100644 --- a/peer.c +++ b/peer.c @@ -1,6 +1,6 @@ /* -*-c-*- * - * $Id: peer.c,v 1.8 2003/05/16 12:09:03 mdw Exp $ + * $Id$ * * Communication with the peer * @@ -26,40 +26,6 @@ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/*----- Revision history --------------------------------------------------* - * - * $Log: peer.c,v $ - * Revision 1.8 2003/05/16 12:09:03 mdw - * Allow binding to a chosen address. - * - * Revision 1.7 2003/04/15 14:12:05 mdw - * Insert a newline to improve readability. - * - * Revision 1.6 2001/06/19 22:07:59 mdw - * Use magic number for packet size. - * - * Revision 1.5 2001/03/03 11:15:19 mdw - * Set the socket send and receive buffers to maximum. At least this way, - * we won't drop large packets on the floor. If the administrator wants to - * prevent fragmentation of TrIPE messages, he can lower the MTU on the - * tunnel interface. Getting path-MTU stuff out of the kernel is too much - * system-specific hard work for this program. - * - * Revision 1.4 2001/02/16 21:40:24 mdw - * Change key exchange message interface. Maintain statistics. - * - * Revision 1.3 2001/02/04 17:10:58 mdw - * Make file descriptors be nonblocking and close-on-exec. - * - * Revision 1.2 2001/02/03 22:40:29 mdw - * Put timer information into the entropy pool when packets are received - * and on similar events. Reseed the generator on the interval timer. - * - * Revision 1.1 2001/02/03 20:26:37 mdw - * Initial checkin. - * - */ - /*----- Header files ------------------------------------------------------*/ #include "tripe.h" @@ -69,6 +35,22 @@ static peer *peers = 0; static sel_file sock; +/*----- Tunnel table ------------------------------------------------------*/ + +const tunnel_ops *tunnels[] = { +#ifdef TUN_LINUX + &tun_linux, +#endif +#ifdef TUN_BSD + &tun_bsd, +#endif +#ifdef TUN_UNET + &tun_unet, +#endif + &tun_slip, + 0 +}, *tun_default; + /*----- Main code ---------------------------------------------------------*/ /* --- @p_read@ --- * @@ -97,7 +79,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; } @@ -109,13 +91,15 @@ 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: - T( trace(T_PEER, "peer: packet received from `%s'", p->name); - trace_block(T_PACKET, "peer: packet contents", buf_i, n); ) + IF_TRACING(T_PEER, { + trace(T_PEER, "peer: packet received from `%s'", p->name); + trace_block(T_PACKET, "peer: packet contents", buf_i, n); + }) /* --- Pick the packet apart --- */ @@ -124,29 +108,29 @@ 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, &b, &bb)) { + 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)) { p->st.n_ipin++; p->st.sz_ipin += BSZ(&b); - tun_inject(&p->t, &bb); + p->t->ops->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: @@ -154,7 +138,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; } } @@ -189,14 +173,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); @@ -218,7 +202,7 @@ void p_tun(peer *p, buf *b) buf *bb = p_txstart(p, MSG_PACKET); TIMER; - if (ksl_encrypt(&p->ks, b, bb)) + if (ksl_encrypt(&p->ks, MSG_PACKET, b, bb)) kx_start(&p->kx); if (BOK(bb) && BLEN(bb)) { p->st.n_ipout++; @@ -266,7 +250,7 @@ stats *p_stats(peer *p) { return (&p->st); } * Returns: A pointer to the peer's interface name. */ -const char *p_ifname(peer *p) { return (tun_ifname(&p->t)); } +const char *p_ifname(peer *p) { return (p->t->ops->ifname(p->t)); } /* --- @p_addr@ --- * * @@ -341,6 +325,7 @@ unsigned p_port(void) /* --- @p_create@ --- * * * Arguments: @const char *name@ = name for this peer + * @const tunnel_ops *tops@ = tunnel to use * @struct sockaddr *sa@ = socket address of peer * @size_t sz@ = size of socket address * @@ -350,9 +335,11 @@ unsigned p_port(void) * by this point. */ -peer *p_create(const char *name, struct sockaddr *sa, size_t sz) +peer *p_create(const char *name, const tunnel_ops *tops, + struct sockaddr *sa, size_t sz) { peer *p = CREATE(peer); + T( trace(T_PEER, "peer: creating new peer `%s'", name); ) p->name = xstrdup(name); p->ks = 0; @@ -363,12 +350,25 @@ peer *p_create(const char *name, struct sockaddr *sa, size_t sz) p->st.t_start = time(0); if (kx_init(&p->kx, p, &p->ks)) goto tidy_0; - if (tun_create(&p->t, p)) + if ((p->t = tops->create(p)) == 0) goto tidy_1; p->next = peers; if (peers) peers->prev = p; peers = p; + switch (p->peer.sa.sa_family) { + case AF_INET: + a_notify("ADD %s %s INET %s %u", + name, + p->t->ops->ifname(p->t), + inet_ntoa(p->peer.sin.sin_addr), + (unsigned)ntohs(p->peer.sin.sin_port)); + break; + default: + a_notify("ADD %s %s UNKNOWN", name, p->t->ops->ifname(p->t)); + break; + } + a_notify("KXSTART %s", name); /* Couldn't tell anyone before */ return (p); tidy_1: @@ -419,9 +419,10 @@ 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); + p->t->ops->destroy(p->t); xfree(p->name); if (p->next) p->next->prev = p->prev;