j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Cleanups.

Browse source
This commit is contained in:
Guus Sliepen 2000-05-14 12:22:42 +00:00
parent 8caa1b9d75
commit ee96ccabbb
19 changed files with 44 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
AUTHORS
View file

@ -5,5 +5,5 @@ Ivo Timmermans <itimmermans@bigfoot.com>
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.

8
README
View file

@ -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 <zarq@iname.com> and
tinc is Copyright (C) 1998,1999,2000 Ivo Timmermans <zarq@iname.com> 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/<net>/.
/etc/tinc/<net>/. 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

2
THANKS
View file

@ -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!

2
cipher/cipher.c
View file

@ -1,6 +1,6 @@
/*
cipher.c -- wrapper functions for encryption algorithms
Copyright (C) 1999 Ivo Timmermans <zarq@iname.com>
Copyright (C) 1999,2000 Ivo Timmermans <zarq@iname.com>
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

2
cipher/cipher.h
View file

@ -1,6 +1,6 @@
/*
cipher.c -- header file for cipher.c
Copyright (C) 1999 Ivo Timmermans <zarq@iname.com>
Copyright (C) 1999,2000 Ivo Timmermans <zarq@iname.com>
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

2
doc/tinc.conf.5
View file

@ -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"

11
doc/tinc.texi
View file

@ -12,7 +12,7 @@
This is the info manual for tinc, a Virtual Private Network daemon.
Copyright 1998 Ivo Timmermans <itimmermans@@bigfoot.com>
Copyright 1998,199,2000 Ivo Timmermans <itimmermans@@bigfoot.com>
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 <itimmermans@@bigfoot.com>
@page
@vskip 0pt plus 1filll
Copyright @copyright{} 1998 Ivo Timmermans <itimmermans@@bigfoot.com>
Copyright @copyright{} 1998,1999,2000 Ivo Timmermans <itimmermans@@bigfoot.com>
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

8
src/conf.c
View file

@ -1,7 +1,7 @@
/*
conf.c -- configuration code
Copyright (C) 1998 Emphyrio,
Copyright (C) 1998,99 Ivo Timmermans <zarq@iname.com>
Copyright (C) 1998,1999,2000 Ivo Timmermans <zarq@iname.com>
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 <ctype.h>
@ -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;
}

2
src/conf.h
View file

@ -1,6 +1,6 @@
/*
conf.h -- header for conf.c
Copyright (C) 1998,99 Ivo Timmermans <zarq@iname.com>
Copyright (C) 1998,1999,2000 Ivo Timmermans <zarq@iname.com>
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

4
src/encr.c
View file

@ -1,6 +1,6 @@
/*
encr.c -- everything that deals with encryption
Copyright (C) 1998,99 Ivo Timmermans <zarq@iname.com>
Copyright (C) 1998,1999,2000 Ivo Timmermans <zarq@iname.com>
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
}

2
src/encr.h
View file

@ -1,6 +1,6 @@
/*
encr.h -- header for encr.c
Copyright (C) 1998,99 Ivo Timmermans <zarq@iname.com>
Copyright (C) 1998,1999,2000 Ivo Timmermans <zarq@iname.com>
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

2
src/genauth.c
View file

@ -1,6 +1,6 @@
/*
genauth.c -- generate a random passphrase
Copyright (C) 1998,99 Ivo Timmermans <zarq@iname.com>
Copyright (C) 1998,1999,2000 Ivo Timmermans <zarq@iname.com>
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

17
src/net.c
View file

@ -1,6 +1,6 @@
/*
net.c -- most of the network code
Copyright (C) 1998,99 Ivo Timmermans <zarq@iname.com>
Copyright (C) 1998,1999,2000 Ivo Timmermans <zarq@iname.com>
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
*/

3
src/net.h
View file

@ -1,6 +1,6 @@
/*
net.h -- header for net.c
Copyright (C) 1998,99 Ivo Timmermans <zarq@iname.com>
Copyright (C) 1998,1999,2000 Ivo Timmermans <zarq@iname.com>
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);

4
src/netutl.c
View file

@ -1,6 +1,6 @@
/*
netutl.c -- some supporting network utility code
Copyright (C) 1998,99 Ivo Timmermans <zarq@iname.com>
Copyright (C) 1998,1999,2000 Ivo Timmermans <zarq@iname.com>
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)

2
src/netutl.h
View file

@ -1,6 +1,6 @@
/*
netutl.h -- header file for netutl.c
Copyright (C) 1998,99 Ivo Timmermans <zarq@iname.com>
Copyright (C) 1998,1999,2000 Ivo Timmermans <zarq@iname.com>
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

6
src/protocol.c
View file

@ -1,6 +1,6 @@
/*
protocol.c -- handle the meta-protocol
Copyright (C) 1999 Ivo Timmermans <zarq@iname.com>
Copyright (C) 1999,2000 Ivo Timmermans <zarq@iname.com>
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

4
src/protocol.h
View file

@ -1,6 +1,6 @@
/*
protocol.h -- header for protocol.c
Copyright (C) 1999 Ivo Timmermans <zarq@iname.com>
Copyright (C) 1999,2000 Ivo Timmermans <zarq@iname.com>
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__ */

8
src/tincd.c
View file

@ -1,6 +1,6 @@
/*
tincd.c -- the main file for tincd
Copyright (C) 1998,99 Ivo Timmermans <zarq@iname.com>
Copyright (C) 1998,1999,2000 Ivo Timmermans <zarq@iname.com>
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);
}