Releasing 1.1pre5.

benheise · Jan 20, 2013 · cc3c69c · cc3c69c
1 parent 76dbcf8
commit cc3c69c
Show file tree

Hide file tree

Showing 34 changed files with 53 additions and 36 deletions.
diff --git a/NEWS b/NEWS
@@ -1,3 +1,18 @@
+Version 1.1pre5 January 20 2013
+
+ * Fixed long delays and possible hangs on Windows.
+
+ * Fixed support for the tunemu device on iOS, the UML and VDE devices.
+
+ * Small improvements to the documentation and error messages.
+
+ * Fixed broadcast packets not reaching the whole VPN.
+
+ * Tincctl now connects via a UNIX socket to the tincd on platforms that
+ support this.
+
+ * The PriorityInheritance option now also works in switch mode.
+
 Version 1.1pre4 December 5 2012
 
  * Added the "AutoConnect" option which will let tinc automatically select

diff --git a/README b/README
@@ -1,7 +1,7 @@
-This is the README file for tinc version 1.1pre4. Installation
+This is the README file for tinc version 1.1pre5. Installation
 instructions may be found in the INSTALL file.
 
-tinc is Copyright (C) 1998-2012 by:
+tinc is Copyright (C) 1998-2013 by:
 
 Ivo Timmermans,
 Guus Sliepen <[email protected]>,
@@ -36,11 +36,11 @@ at your own risk.
 Compatibility
 -------------
 
-Version 1.1pre4 is compatible with 1.0pre8, 1.0 and later, but not with older
+Version 1.1pre5 is compatible with 1.0pre8, 1.0 and later, but not with older
 versions of tinc.
 
 When the ExperimentalProtocol option is used, tinc is still compatible with
-1.0.X and 1.1pre4 itself, but not with any other 1.1preX version.
+1.0.X and 1.1pre5 itself, but not with any other 1.1preX version.
 
 
 Requirements

diff --git a/THANKS b/THANKS
@@ -6,7 +6,9 @@ We would like to thank the following people for their contributions to tinc:
 * Anthony G. Basile
 * Armijn Hemel
 * Brandon Black
+* Cheng LI
 * Cris van Pelt
+* Darius Jahandarie
 * Delf Eldkraft
 * dnk
 * Enrique Zanardi

diff --git a/configure.in b/configure.in
@@ -4,7 +4,7 @@ AC_PREREQ(2.61)
 AC_INIT
 AC_CONFIG_SRCDIR([src/tincd.c])
 AC_GNU_SOURCE
-AM_INIT_AUTOMAKE(tinc, 1.1pre4)
+AM_INIT_AUTOMAKE(tinc, 1.1pre5)
 AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE
 

diff --git a/doc/tinc.conf.5.in b/doc/tinc.conf.5.in
@@ -1,4 +1,4 @@
-.Dd 2012-09-27
+.Dd 2013-01-14
 .Dt TINC.CONF 5
 .\" Manual page created by:
 .\" Ivo Timmermans

diff --git a/doc/tinc.texi b/doc/tinc.texi
@@ -15,7 +15,7 @@
 
 This is the info manual for @value{PACKAGE} version @value{VERSION}, a Virtual Private Network daemon.
 
-Copyright @copyright{} 1998-2012 Ivo Timmermans,
+Copyright @copyright{} 1998-2013 Ivo Timmermans,
 Guus Sliepen <guus@@tinc-vpn.org> and
 Wessel Dankers <wsl@@tinc-vpn.org>.
 
@@ -39,7 +39,7 @@ permission notice identical to this one.
 @vskip 0pt plus 1filll
 This is the info manual for @value{PACKAGE} version @value{VERSION}, a Virtual Private Network daemon.
 
-Copyright @copyright{} 1998-2012 Ivo Timmermans,
+Copyright @copyright{} 1998-2013 Ivo Timmermans,
 Guus Sliepen <guus@@tinc-vpn.org> and
 Wessel Dankers <wsl@@tinc-vpn.org>.
 

diff --git a/doc/tincctl.8.in b/doc/tincctl.8.in
@@ -1,4 +1,4 @@
-.Dd 2012-10-14
+.Dd 2013-01-15
 .Dt TINCCTL 8
 .\" Manual page created by:
 .\" Scott Lamb

diff --git a/doc/tincd.8.in b/doc/tincd.8.in
@@ -1,4 +1,4 @@
-.Dd 2012-02-22
+.Dd 2013-01-14
 .Dt TINCD 8
 .\" Manual page created by:
 .\" Ivo Timmermans

diff --git a/src/bsd/device.c b/src/bsd/device.c
@@ -1,7 +1,7 @@
 /*
  device.c -- Interaction BSD tun/tap device
  Copyright (C) 2001-2005 Ivo Timmermans,
- 2001-2012 Guus Sliepen <[email protected]>
+ 2001-2013 Guus Sliepen <[email protected]>
  2009 Grzegorz Dymarek <[email protected]>
 
  This program is free software; you can redistribute it and/or modify

diff --git a/src/conf.c b/src/conf.c
@@ -2,7 +2,7 @@
  conf.c -- configuration code
  Copyright (C) 1998 Robert van der Meulen
  1998-2005 Ivo Timmermans
- 2000-2012 Guus Sliepen <[email protected]>
+ 2000-2013 Guus Sliepen <[email protected]>
  2010-2011 Julien Muchembled <[email protected]>
  2000 Cris van Pelt
 

diff --git a/src/conf.h b/src/conf.h
@@ -1,7 +1,7 @@
 /*
  conf.h -- header for conf.c
  Copyright (C) 1998-2005 Ivo Timmermans
- 2000-2012 Guus Sliepen <[email protected]>
+ 2000-2013 Guus Sliepen <[email protected]>
 
  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/control.c b/src/control.c
@@ -1,6 +1,6 @@
 /*
  control.c -- Control socket handling.
- Copyright (C) 2012 Guus Sliepen <[email protected]>
+ Copyright (C) 2013 Guus Sliepen <[email protected]>
 
  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/cygwin/device.c b/src/cygwin/device.c
@@ -1,7 +1,7 @@
 /*
  device.c -- Interaction with Windows tap driver in a Cygwin environment
  Copyright (C) 2002-2005 Ivo Timmermans,
- 2002-2012 Guus Sliepen <[email protected]>
+ 2002-2013 Guus Sliepen <[email protected]>
 
  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/graph.c b/src/graph.c
@@ -1,6 +1,6 @@
 /*
  graph.c -- graph algorithms
- Copyright (C) 2001-2012 Guus Sliepen <[email protected]>,
+ Copyright (C) 2001-2013 Guus Sliepen <[email protected]>,
  2001-2005 Ivo Timmermans
 
  This program is free software; you can redistribute it and/or modify

diff --git a/src/linux/device.c b/src/linux/device.c
@@ -1,7 +1,7 @@
 /*
  device.c -- Interaction with Linux ethertap and tun/tap device
  Copyright (C) 2001-2005 Ivo Timmermans,
- 2001-2012 Guus Sliepen <[email protected]>
+ 2001-2013 Guus Sliepen <[email protected]>
 
  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/logger.c b/src/logger.c
@@ -1,6 +1,6 @@
 /*
  logger.c -- logging code
- Copyright (C) 2004-2012 Guus Sliepen <[email protected]>
+ Copyright (C) 2004-2013 Guus Sliepen <[email protected]>
  2004-2005 Ivo Timmermans
 
  This program is free software; you can redistribute it and/or modify

diff --git a/src/mingw/device.c b/src/mingw/device.c
@@ -1,7 +1,7 @@
 /*
  device.c -- Interaction with Windows tap driver in a MinGW environment
  Copyright (C) 2002-2005 Ivo Timmermans,
- 2002-2012 Guus Sliepen <[email protected]>
+ 2002-2013 Guus Sliepen <[email protected]>
 
  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
@@ -1,7 +1,7 @@
 /*
  net.c -- most of the network code
  Copyright (C) 1998-2005 Ivo Timmermans,
- 2000-2012 Guus Sliepen <[email protected]>
+ 2000-2013 Guus Sliepen <[email protected]>
  2006 Scott Lamb <[email protected]>
  2011 Loïc Grenié <[email protected]>
 

diff --git a/src/net.h b/src/net.h
@@ -1,7 +1,7 @@
 /*
  net.h -- header for net.c
  Copyright (C) 1998-2005 Ivo Timmermans
- 2000-2012 Guus Sliepen <[email protected]>
+ 2000-2013 Guus Sliepen <[email protected]>
 
  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_packet.c b/src/net_packet.c
@@ -1,7 +1,7 @@
 /*
  net_packet.c -- Handles in- and outgoing VPN packets
  Copyright (C) 1998-2005 Ivo Timmermans,
- 2000-2012 Guus Sliepen <[email protected]>
+ 2000-2013 Guus Sliepen <[email protected]>
  2010 Timothy Redaelli <[email protected]>
  2010 Brandon Black <[email protected]>
 

diff --git a/src/net_setup.c b/src/net_setup.c
@@ -1,7 +1,7 @@
 /*
  net_setup.c -- Setup.
  Copyright (C) 1998-2005 Ivo Timmermans,
- 2000-2012 Guus Sliepen <[email protected]>
+ 2000-2013 Guus Sliepen <[email protected]>
  2006 Scott Lamb <[email protected]>
  2010 Brandon Black <[email protected]>
 

diff --git a/src/net_socket.c b/src/net_socket.c
@@ -1,7 +1,7 @@
 /*
  net_socket.c -- Handle various kinds of sockets.
  Copyright (C) 1998-2005 Ivo Timmermans,
- 2000-2012 Guus Sliepen <[email protected]>
+ 2000-2013 Guus Sliepen <[email protected]>
  2006 Scott Lamb <[email protected]>
  2009 Florian Forster <[email protected]>
 

diff --git a/src/node.h b/src/node.h
@@ -1,6 +1,6 @@
 /*
  node.h -- header for node.c
- Copyright (C) 2001-2012 Guus Sliepen <[email protected]>,
+ Copyright (C) 2001-2013 Guus Sliepen <[email protected]>,
  2001-2005 Ivo Timmermans
 
  This program is free software; you can redistribute it and/or modify

diff --git a/src/process.c b/src/process.c
@@ -1,7 +1,7 @@
 /*
  process.c -- process management functions
  Copyright (C) 1999-2005 Ivo Timmermans,
- 2000-2012 Guus Sliepen <[email protected]>
+ 2000-2013 Guus Sliepen <[email protected]>
 
  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_key.c b/src/protocol_key.c
@@ -1,7 +1,7 @@
 /*
  protocol_key.c -- handle the meta-protocol, key exchange
  Copyright (C) 1999-2005 Ivo Timmermans,
- 2000-2012 Guus Sliepen <[email protected]>
+ 2000-2013 Guus Sliepen <[email protected]>
 
  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/route.c b/src/route.c
@@ -1,7 +1,7 @@
 /*
  route.c -- routing
  Copyright (C) 2000-2005 Ivo Timmermans,
- 2000-2012 Guus Sliepen <[email protected]>
+ 2000-2013 Guus Sliepen <[email protected]>
 
  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/solaris/device.c b/src/solaris/device.c
@@ -1,7 +1,7 @@
 /*
  device.c -- Interaction with Solaris tun device
  Copyright (C) 2001-2005 Ivo Timmermans,
- 2001-2012 Guus Sliepen <[email protected]>
+ 2001-2013 Guus Sliepen <[email protected]>
 
  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/sptps.c b/src/sptps.c
@@ -1,6 +1,6 @@
 /*
  sptps.c -- Simple Peer-to-Peer Security
- Copyright (C) 2011-2012 Guus Sliepen <[email protected]>,
+ Copyright (C) 2011-2013 Guus Sliepen <[email protected]>,
  2010 Brandon L. Black <[email protected]>
 
  This program is free software; you can redistribute it and/or modify

diff --git a/src/sptps.h b/src/sptps.h
@@ -1,6 +1,6 @@
 /*
  sptps.h -- Simple Peer-to-Peer Security
- Copyright (C) 2011-2012 Guus Sliepen <[email protected]>,
+ Copyright (C) 2011-2013 Guus Sliepen <[email protected]>,
 
  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/subnet.c b/src/subnet.c
@@ -1,6 +1,6 @@
 /*
  subnet.c -- handle subnet lookups and lists
- Copyright (C) 2000-2012 Guus Sliepen <[email protected]>,
+ Copyright (C) 2000-2013 Guus Sliepen <[email protected]>,
  2000-2005 Ivo Timmermans
 
  This program is free software; you can redistribute it and/or modify

diff --git a/src/tincctl.c b/src/tincctl.c
@@ -1,6 +1,6 @@
 /*
  tincctl.c -- Controlling a running tincd
- Copyright (C) 2007-2012 Guus Sliepen <[email protected]>
+ Copyright (C) 2007-2013 Guus Sliepen <[email protected]>
 
  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/tincd.c b/src/tincd.c
@@ -1,7 +1,7 @@
 /*
  tincd.c -- the main file for tincd
  Copyright (C) 1998-2005 Ivo Timmermans
- 2000-2012 Guus Sliepen <[email protected]>
+ 2000-2013 Guus Sliepen <[email protected]>
  2008 Max Rijevski <[email protected]>
  2009 Michael Tokarev <[email protected]>
  2010 Julien Muchembled <[email protected]>

diff --git a/src/uml_device.c b/src/uml_device.c
@@ -1,7 +1,7 @@
 /*
  device.c -- UML network socket
  Copyright (C) 2002-2005 Ivo Timmermans,
- 2002-2012 Guus Sliepen <[email protected]>
+ 2002-2013 Guus Sliepen <[email protected]>
 
  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/vde_device.c b/src/vde_device.c
@@ -1,6 +1,6 @@
 /*
  device.c -- VDE plug
- Copyright (C) 2012 Guus Sliepen <[email protected]>
+ Copyright (C) 2013 Guus Sliepen <[email protected]>
 
  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