From ee96ccabbbf0180d5631d3c22838456f28ee9c15 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Sun, 14 May 2000 12:22:42 +0000 Subject: [PATCH] Cleanups. --- AUTHORS | 4 ++-- README | 8 ++++++-- THANKS | 2 +- cipher/cipher.c | 2 +- cipher/cipher.h | 2 +- doc/tinc.conf.5 | 2 +- doc/tinc.texi | 11 +++++++++-- src/conf.c | 8 ++------ src/conf.h | 2 +- src/encr.c | 4 ++-- src/encr.h | 2 +- src/genauth.c | 2 +- src/net.c | 17 +---------------- src/net.h | 3 +-- src/netutl.c | 4 ++-- src/netutl.h | 2 +- src/protocol.c | 6 ++++-- src/protocol.h | 4 ++-- src/tincd.c | 8 +++++--- 19 files changed, 44 insertions(+), 49 deletions(-) diff --git a/AUTHORS b/AUTHORS index 17b18ba..aa39942 100644 --- a/AUTHORS +++ b/AUTHORS @@ -5,5 +5,5 @@ Ivo Timmermans These files are from other sources: * lib/pidfile.h and lib/pidfile.c are by Martin Schulze, taken from the syslog 1.3 sources. - * The files cipher/blowfish/ and cipher/idea/ are from the SSLeay - package by Eric Young. + * The files in cipher/blowfish/ are from the SSLeay package by + Eric Young. diff --git a/README b/README index bb768a4..d368fc8 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ This is the README file for tinc version 1.0. Installation instructions may be found in the INSTALL file. -tinc is Copyright (C) 1998,99 Ivo Timmermans and +tinc is Copyright (C) 1998,1999,2000 Ivo Timmermans and others. For a complete list of authors see the AUTHORS file. This product includes software developed by Eric Young (eay@mincom.oz.au) @@ -18,7 +18,11 @@ do this, configure will (hopefully) mention it to you. This version of tinc supports multiple virtual networks at once. To use this feature, you may supply a netname via the -n or --net options. The standard locations for the config files will then be -/etc/tinc//. +/etc/tinc//. Because of this feature, tinc will send packets +directly to their destinations, instead of to the uplink. If this +behaviour is undesirable (for instance because of firewalls or +other restrictions), please use an older version of tinc (I would +recommend tinc-0.2.19). In this version, MAC addresses are stripped off before encoding and sending a packet. When the packet reaches its destination, the MAC diff --git a/THANKS b/THANKS index 0af66b6..fceb3fd 100644 --- a/THANKS +++ b/THANKS @@ -12,7 +12,7 @@ I would like to thank * Sander Smeenk * Tijs van Bakel * Wessel Dankers (for the name `tinc' and being a royal pain in the -ass (je hebt erom gevraagd)) + ass (je hebt erom gevraagd)) for their help, support and ideas. Thank you guys! diff --git a/cipher/cipher.c b/cipher/cipher.c index afe173a..c504b7e 100644 --- a/cipher/cipher.c +++ b/cipher/cipher.c @@ -1,6 +1,6 @@ /* cipher.c -- wrapper functions for encryption algorithms - Copyright (C) 1999 Ivo Timmermans + Copyright (C) 1999,2000 Ivo Timmermans This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/cipher/cipher.h b/cipher/cipher.h index 647dcab..d5897e3 100644 --- a/cipher/cipher.h +++ b/cipher/cipher.h @@ -1,6 +1,6 @@ /* cipher.c -- header file for cipher.c - Copyright (C) 1999 Ivo Timmermans + Copyright (C) 1999,2000 Ivo Timmermans This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/doc/tinc.conf.5 b/doc/tinc.conf.5 index d6d8f50..e456df6 100644 --- a/doc/tinc.conf.5 +++ b/doc/tinc.conf.5 @@ -1,4 +1,4 @@ -.TH TINC 5 "March 1999" "tinc version 0.2.16" "FSF" +.TH TINC 5 "May 2000" "tinc version 1.0" "FSF" .SH NAME tincd.conf \- tinc daemon configuration .SH "DESCRIPTION" diff --git a/doc/tinc.texi b/doc/tinc.texi index dea5a9b..fdcbf45 100644 --- a/doc/tinc.texi +++ b/doc/tinc.texi @@ -12,7 +12,7 @@ This is the info manual for tinc, a Virtual Private Network daemon. -Copyright 1998 Ivo Timmermans +Copyright 1998,199,2000 Ivo Timmermans Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and @@ -34,7 +34,7 @@ Copyright 1998 Ivo Timmermans @page @vskip 0pt plus 1filll -Copyright @copyright{} 1998 Ivo Timmermans +Copyright @copyright{} 1998,1999,2000 Ivo Timmermans Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and @@ -765,6 +765,13 @@ have two connections, we also have two protocols. The protocol used for the UDP data is the ``data-protocol,'' the other one is the ``meta-protocol.'' +The reason we don't use TCP for both protocols is that UDP is much +better for encapsulation, even while it is less reliable. The real +problem is that when TCP would be used to encapsulate a TCP stream +that's on the private network, for every packet sent there would be +three ACK's sent instead of just one. Furthermore, if there would be +a timeout, both TCP streams would sense the timeout, and both would +start resending packets. @c ================================================================== @node Security, , The Connection, Technical information diff --git a/src/conf.c b/src/conf.c index 6f949f5..146a582 100644 --- a/src/conf.c +++ b/src/conf.c @@ -1,7 +1,7 @@ /* conf.c -- configuration code Copyright (C) 1998 Emphyrio, - Copyright (C) 1998,99 Ivo Timmermans + Copyright (C) 1998,1999,2000 Ivo Timmermans This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,9 +18,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* foute config read code, GPL, emphyrio 1998 */ -/* Mutilated by me -- Ivo */ - #include "config.h" #include @@ -49,7 +46,7 @@ typedef struct internal_config_t { These are all the possible configurable values */ static internal_config_t hazahaza[] = { - { "AllowConnect", allowconnect, TYPE_BOOL }, + { "AllowConnect", allowconnect, TYPE_BOOL }, /* Is not used anywhere. Remove? */ { "ConnectTo", upstreamip, TYPE_IP }, { "ConnectPort", upstreamport, TYPE_INT }, { "ListenPort", listenport, TYPE_INT }, @@ -200,4 +197,3 @@ get_config_val(which_t type) /* Not found */ return NULL; } - diff --git a/src/conf.h b/src/conf.h index 0d66313..de74c9f 100644 --- a/src/conf.h +++ b/src/conf.h @@ -1,6 +1,6 @@ /* conf.h -- header for conf.c - Copyright (C) 1998,99 Ivo Timmermans + Copyright (C) 1998,1999,2000 Ivo Timmermans This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/encr.c b/src/encr.c index cde6a99..a2e5531 100644 --- a/src/encr.c +++ b/src/encr.c @@ -1,6 +1,6 @@ /* encr.c -- everything that deals with encryption - Copyright (C) 1998,99 Ivo Timmermans + Copyright (C) 1998,1999,2000 Ivo Timmermans This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -345,7 +345,7 @@ void regenerate_keys(void) cp generate_private_key(); calculate_public_key(); - send_key_changed2(); + send_key_changed_all(); recalculate_encryption_keys(); cp } diff --git a/src/encr.h b/src/encr.h index c2cc132..227c2c8 100644 --- a/src/encr.h +++ b/src/encr.h @@ -1,6 +1,6 @@ /* encr.h -- header for encr.c - Copyright (C) 1998,99 Ivo Timmermans + Copyright (C) 1998,1999,2000 Ivo Timmermans This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/genauth.c b/src/genauth.c index 7e154e3..b727eb6 100644 --- a/src/genauth.c +++ b/src/genauth.c @@ -1,6 +1,6 @@ /* genauth.c -- generate a random passphrase - Copyright (C) 1998,99 Ivo Timmermans + Copyright (C) 1998,1999,2000 Ivo Timmermans This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/net.c b/src/net.c index 7b9133e..dc632b6 100644 --- a/src/net.c +++ b/src/net.c @@ -1,6 +1,6 @@ /* net.c -- most of the network code - Copyright (C) 1998,99 Ivo Timmermans + Copyright (C) 1998,1999,2000 Ivo Timmermans This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -304,21 +304,6 @@ cp return xsend(cl, packet); } -int send_broadcast(conn_list_t *cl, vpn_packet_t *packet) -{ - conn_list_t *p; -cp - for(p = cl; p != NULL; p = p->next) - if(send_packet(p->real_ip, packet) < 0) - { - syslog(LOG_ERR, "Could not send a broadcast packet to %08lx (%08lx): %m", - p->vpn_ip, p->real_ip); - break; /* FIXME: should retry later, and send a ping over the metaconnection. */ - } -cp - return 0; -} - /* open the local ethertap device */ diff --git a/src/net.h b/src/net.h index 830fe43..8e06747 100644 --- a/src/net.h +++ b/src/net.h @@ -1,6 +1,6 @@ /* net.h -- header for net.c - Copyright (C) 1998,99 Ivo Timmermans + Copyright (C) 1998,1999,2000 Ivo Timmermans This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -130,7 +130,6 @@ extern conn_list_t *conn_list; extern conn_list_t *myself; extern int send_packet(ip_t, vpn_packet_t *); -extern int send_broadcast(conn_list_t *, vpn_packet_t *); extern int setup_network_connections(void); extern void close_network_connections(void); extern void main_loop(void); diff --git a/src/netutl.c b/src/netutl.c index df6401f..cc8266d 100644 --- a/src/netutl.c +++ b/src/netutl.c @@ -1,6 +1,6 @@ /* netutl.c -- some supporting network utility code - Copyright (C) 1998,99 Ivo Timmermans + Copyright (C) 1998,1999,2000 Ivo Timmermans This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -42,7 +42,7 @@ conn_list_t *lookup_conn(ip_t ip) { conn_list_t *p = conn_list; - +cp /* Exact match suggested by James B. MacLean */ for(p = conn_list; p != NULL; p = p->next) if(ip == p->vpn_ip) diff --git a/src/netutl.h b/src/netutl.h index 91f388f..f218740 100644 --- a/src/netutl.h +++ b/src/netutl.h @@ -1,6 +1,6 @@ /* netutl.h -- header file for netutl.c - Copyright (C) 1998,99 Ivo Timmermans + Copyright (C) 1998,1999,2000 Ivo Timmermans This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/protocol.c b/src/protocol.c index 5d84c5d..cdf5a31 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -1,6 +1,6 @@ /* protocol.c -- handle the meta-protocol - Copyright (C) 1999 Ivo Timmermans + Copyright (C) 1999,2000 Ivo Timmermans This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -40,6 +40,8 @@ char buffer[MAXBUFSIZE+1]; int buflen; +/* Outgoing request routines */ + int send_ack(conn_list_t *cl) { cp @@ -180,7 +182,7 @@ cp return 0; } -void send_key_changed2(void) +void send_key_changed_all(void) { conn_list_t *p; cp diff --git a/src/protocol.h b/src/protocol.h index b092681..88a0de2 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -1,6 +1,6 @@ /* protocol.h -- header for protocol.c - Copyright (C) 1999 Ivo Timmermans + Copyright (C) 1999,2000 Ivo Timmermans This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -68,7 +68,7 @@ extern int send_basic_info(conn_list_t *); extern int send_termreq(conn_list_t *); extern int send_timeout(conn_list_t *); extern int send_key_request(ip_t); -extern void send_key_changed2(void); +extern void send_key_changed_all(void); #endif /* __TINC_PROTOCOL_H__ */ diff --git a/src/tincd.c b/src/tincd.c index 74dac49..251e125 100644 --- a/src/tincd.c +++ b/src/tincd.c @@ -1,6 +1,6 @@ /* tincd.c -- the main file for tincd - Copyright (C) 1998,99 Ivo Timmermans + Copyright (C) 1998,1999,2000 Ivo Timmermans This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,6 +19,9 @@ /* * $Log: tincd.c,v $ + * Revision 1.8 2000/05/14 12:22:42 guus + * Cleanups. + * * Revision 1.7 2000/04/27 13:47:51 zarq * Default config file name is tinc.conf, and pidfile is tinc.pid. * @@ -343,7 +346,7 @@ main(int argc, char **argv, char **envp) if(show_version) { - printf("%s version %s\nCopyright (C) 1998,99 Ivo Timmermans and others,\n" + printf("%s version %s\nCopyright (C) 1998,1999,2000 Ivo Timmermans and others,\n" "see the AUTHORS file for a complete list.\n\n" "tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n" "and you are welcome to redistribute it under certain conditions;\n" @@ -498,4 +501,3 @@ RETSIGTYPE parent_exit(int a) { exit(0); } - -- 2.25.1