Releasing 1.1pre5.

diff --git a/NEWS b/NEWS
index 3dea2b51b85b1ca911d2ae5f5bc63474461e9194..3ef97cba4450048e03f60ce28a8249e89e7c72bb 100644 (file)
--- 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
 Version 1.1pre4              December  5 2012
 
  * Added the "AutoConnect" option which will let tinc automatically select

diff --git a/README b/README
index 639829caa2c0fa41c3434dcac202e536a4acd118..ba40ae1f59af38540a385bb001c59b8d1be0b772 100644 (file)
--- 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.
 
 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 <guus@tinc-vpn.org>,
 
 Ivo Timmermans,
 Guus Sliepen <guus@tinc-vpn.org>,


@@ -36,11 +36,11 @@ at your own risk.
 Compatibility
 -------------
 
 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
 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
 
 
 Requirements

diff --git a/THANKS b/THANKS
index 7d91271d3d0cbb401bba56faee0b96d1d0260bbb..1f2f73ce9a8fe7f4a67c54e1a0b40b02beb3b1ab 100644 (file)
--- 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
 * Anthony G. Basile
 * Armijn Hemel
 * Brandon Black

+* Cheng LI

 * Cris van Pelt
 * Cris van Pelt

+* Darius Jahandarie

 * Delf Eldkraft
 * dnk
 * Enrique Zanardi
 * Delf Eldkraft
 * dnk
 * Enrique Zanardi

diff --git a/configure.in b/configure.in
index e513248a45d25ad9ffeecb478902e1b954bd436b..88ab6c2e08480a858d4740c1f88a4f2432f0eed2 100644 (file)
--- 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
 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
 
 AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE
 

diff --git a/doc/tinc.conf.5.in b/doc/tinc.conf.5.in
index da2cc302ee21b3e2cf700c2a53175a3a808564ac..c72a6f2469c72fe0ce8f8cfb1d36ffabe0db8468 100644 (file)
--- 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
 .Dt TINC.CONF 5
 .\" Manual page created by:
 .\" Ivo Timmermans

diff --git a/doc/tinc.texi b/doc/tinc.texi
index 35575e94c22aad345d69026e724cc8ce731c7ee6..891011564fe9ebb351ea9a5899dab9346f7d6f6c 100644 (file)
--- 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.
 
 
 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>.
 
 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.
 
 @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>.
 
 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
index 4e29437832f282d72f40e457f0a9438c5c44c846..e5301166ed1822b65c892671dff05b094a9922ad 100644 (file)
--- 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
 .Dt TINCCTL 8
 .\" Manual page created by:
 .\" Scott Lamb

diff --git a/doc/tincd.8.in b/doc/tincd.8.in
index 8f4c620229b83eb3ee07c557047b14cf2d6d117e..88da75d32bbe680cc6fc3385a5c1651c6193c6cc 100644 (file)
--- 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
 .Dt TINCD 8
 .\" Manual page created by:
 .\" Ivo Timmermans

diff --git a/src/bsd/device.c b/src/bsd/device.c
index fa580caca50e32c7dc6b6fe22ffa421bcc484117..9bf0cd52850fbb828d89bc83efbdb486e608e6a9 100644 (file)
--- 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,
 /*
     device.c -- Interaction BSD tun/tap device
     Copyright (C) 2001-2005 Ivo Timmermans,

-                  2001-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2001-2013 Guus Sliepen <guus@tinc-vpn.org>

                   2009      Grzegorz Dymarek <gregd72002@googlemail.com>
 
     This program is free software; you can redistribute it and/or modify
                   2009      Grzegorz Dymarek <gregd72002@googlemail.com>
 
     This program is free software; you can redistribute it and/or modify

diff --git a/src/conf.c b/src/conf.c
index 46fd81d57d3897cbcb1f341e00afa8a7cb8aa402..c4f8abb8303f649eff8f9f96eeb751f3f015d357 100644 (file)
--- 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
     conf.c -- configuration code
     Copyright (C) 1998 Robert van der Meulen
                   1998-2005 Ivo Timmermans

-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>

                   2010-2011 Julien Muchembled <jm@jmuchemb.eu>
                   2000 Cris van Pelt
 
                   2010-2011 Julien Muchembled <jm@jmuchemb.eu>
                   2000 Cris van Pelt
 

diff --git a/src/conf.h b/src/conf.h
index 5395322e6bee3519869bda6b87f58e507670868b..4f39b20ac9133dcfd3fc03dd3598ee17012c4e4d 100644 (file)
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,7 +1,7 @@
 /*
     conf.h -- header for conf.c
     Copyright (C) 1998-2005 Ivo Timmermans
 /*
     conf.h -- header for conf.c
     Copyright (C) 1998-2005 Ivo Timmermans

-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>

 
     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
 
     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
index cc5bbb0a016db770b90b93631e1b121d3b598ed9..539ff3605993c3c3bb80033e5140e2f53b6320de 100644 (file)
--- a/src/control.c
+++ b/src/control.c
@@ -1,6 +1,6 @@
 /*
     control.c -- Control socket handling.
 /*
     control.c -- Control socket handling.

-    Copyright (C) 2012 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2013 Guus Sliepen <guus@tinc-vpn.org>

 
     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
 
     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
index c028cbf9766864077ab3b7bf660d52bb977a0b87..b050140ef080d241e12c7ed1aaa03f9d6c5b263e 100644 (file)
--- 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,
 /*
     device.c -- Interaction with Windows tap driver in a Cygwin environment
     Copyright (C) 2002-2005 Ivo Timmermans,

-                  2002-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2002-2013 Guus Sliepen <guus@tinc-vpn.org>

 
     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
 
     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
index e5f70902f95b0ca2b4650d212665ee01ec47f103..7079f93efc5e98513541b47de14d823211874b30 100644 (file)
--- a/src/graph.c
+++ b/src/graph.c
@@ -1,6 +1,6 @@
 /*
     graph.c -- graph algorithms
 /*
     graph.c -- graph algorithms

-    Copyright (C) 2001-2012 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2001-2013 Guus Sliepen <guus@tinc-vpn.org>,

                   2001-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
                   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
index 45df6382352bb9c9a53b45657263ecca6e0765dd..e262c6a52cd50f14114563d2d67b9cd1ea508518 100644 (file)
--- 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,
 /*
     device.c -- Interaction with Linux ethertap and tun/tap device
     Copyright (C) 2001-2005 Ivo Timmermans,

-                  2001-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2001-2013 Guus Sliepen <guus@tinc-vpn.org>

 
     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
 
     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
index 6fb972d136149674779661ba4b28fbacf2d328ac..2b4c7e388ed007a0367969ae6578ba29295452fe 100644 (file)
--- a/src/logger.c
+++ b/src/logger.c
@@ -1,6 +1,6 @@
 /*
     logger.c -- logging code
 /*
     logger.c -- logging code

-    Copyright (C) 2004-2012 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2004-2013 Guus Sliepen <guus@tinc-vpn.org>

                   2004-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
                   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
index 00644dba95a951ccc386dd373688abda4d304d99..d13b824afd5b21f9432a47a356739ea4de1182fc 100644 (file)
--- 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,
 /*
     device.c -- Interaction with Windows tap driver in a MinGW environment
     Copyright (C) 2002-2005 Ivo Timmermans,

-                  2002-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2002-2013 Guus Sliepen <guus@tinc-vpn.org>

 
     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
 
     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 f34c8c632d207fcf34728d9706d1f18610f536fa..3d17d3cfeb60777c49d37c46541b844f899e1aa4 100644 (file)
--- 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,
 /*
     net.c -- most of the network code
     Copyright (C) 1998-2005 Ivo Timmermans,

-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>

                   2006      Scott Lamb <slamb@slamb.org>
                   2011      Loïc Grenié <loic.grenie@gmail.com>
 
                   2006      Scott Lamb <slamb@slamb.org>
                   2011      Loïc Grenié <loic.grenie@gmail.com>
 

diff --git a/src/net.h b/src/net.h
index 0165d1e07845900c1d6938baf0fbaf8b7564294a..8d236dadf2eb302ec492945f4a4aad7c5baa6c8e 100644 (file)
--- a/src/net.h
+++ b/src/net.h
@@ -1,7 +1,7 @@
 /*
     net.h -- header for net.c
     Copyright (C) 1998-2005 Ivo Timmermans
 /*
     net.h -- header for net.c
     Copyright (C) 1998-2005 Ivo Timmermans

-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>

 
     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
 
     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
index 1e455434be6f48382bbe776bf46734f388027c71..c034f852e604d39ec7fcb114c3804d703c7c66b8 100644 (file)
--- 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,
 /*
     net_packet.c -- Handles in- and outgoing VPN packets
     Copyright (C) 1998-2005 Ivo Timmermans,

-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>

                   2010      Timothy Redaelli <timothy@redaelli.eu>
                   2010      Brandon Black <blblack@gmail.com>
 
                   2010      Timothy Redaelli <timothy@redaelli.eu>
                   2010      Brandon Black <blblack@gmail.com>
 

diff --git a/src/net_setup.c b/src/net_setup.c
index 15f9f84b8c39e82d85cc5ecc9fdbfdf7cfebae59..a4fd3a4beffc8b8c710145db94fd4b4357f33e2b 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -1,7 +1,7 @@
 /*
     net_setup.c -- Setup.
     Copyright (C) 1998-2005 Ivo Timmermans,
 /*
     net_setup.c -- Setup.
     Copyright (C) 1998-2005 Ivo Timmermans,

-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>

                   2006      Scott Lamb <slamb@slamb.org>
                   2010      Brandon Black <blblack@gmail.com>
 
                   2006      Scott Lamb <slamb@slamb.org>
                   2010      Brandon Black <blblack@gmail.com>
 

diff --git a/src/net_socket.c b/src/net_socket.c
index 49408bd9a2ccc9f1bb6a61639968b059a103c5b5..d5f85d5a0ceac9a3ed59f9f952c4a85136d6ad77 100644 (file)
--- 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,
 /*
     net_socket.c -- Handle various kinds of sockets.
     Copyright (C) 1998-2005 Ivo Timmermans,

-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>

                   2006      Scott Lamb <slamb@slamb.org>
                   2009      Florian Forster <octo@verplant.org>
 
                   2006      Scott Lamb <slamb@slamb.org>
                   2009      Florian Forster <octo@verplant.org>
 

diff --git a/src/node.h b/src/node.h
index 51938cd63e3a9d5fe1024e47b61512881578a4e8..e4b47b3872173fa4ea1dd01b21c476600ed66a2f 100644 (file)
--- a/src/node.h
+++ b/src/node.h
@@ -1,6 +1,6 @@
 /*
     node.h -- header for node.c
 /*
     node.h -- header for node.c

-    Copyright (C) 2001-2012 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2001-2013 Guus Sliepen <guus@tinc-vpn.org>,

                   2001-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
                   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
index 04c19ed9ee3164989dc4fb6284d9c9b1ca5100e3..0f399e79605dc8a7e357427beb06113cc9a45a15 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -1,7 +1,7 @@
 /*
     process.c -- process management functions
     Copyright (C) 1999-2005 Ivo Timmermans,
 /*
     process.c -- process management functions
     Copyright (C) 1999-2005 Ivo Timmermans,

-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>

 
     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
 
     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
index f96c24e8a8191f3a6cf93b04b517dfcf71afdd13..115845a0e206777e13df93aba2455feb4a5e3636 100644 (file)
--- 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,
 /*
     protocol_key.c -- handle the meta-protocol, key exchange
     Copyright (C) 1999-2005 Ivo Timmermans,

-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>

 
     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
 
     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
index 1d0c6f8a40efc15560bdade6fec92450ddbb35b4..189637424bf7e4f79fcf324140036ded91e833f8 100644 (file)
--- a/src/route.c
+++ b/src/route.c
@@ -1,7 +1,7 @@
 /*
     route.c -- routing
     Copyright (C) 2000-2005 Ivo Timmermans,
 /*
     route.c -- routing
     Copyright (C) 2000-2005 Ivo Timmermans,

-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>

 
     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
 
     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
index 03f7fe9e62398b486b648e65f45a50dd0cfe33be..c8c5cbf8a62b9206d29b7ad3aaa37d05e152d00d 100644 (file)
--- 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,
 /*
     device.c -- Interaction with Solaris tun device
     Copyright (C) 2001-2005 Ivo Timmermans,

-                  2001-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2001-2013 Guus Sliepen <guus@tinc-vpn.org>

 
     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
 
     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
index c22926a84184353ee59fbad823442074dc561a37..fe978441a912b62249a4f7192b1fecd189afe3a2 100644 (file)
--- a/src/sptps.c
+++ b/src/sptps.c
@@ -1,6 +1,6 @@
 /*
     sptps.c -- Simple Peer-to-Peer Security
 /*
     sptps.c -- Simple Peer-to-Peer Security

-    Copyright (C) 2011-2012 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2011-2013 Guus Sliepen <guus@tinc-vpn.org>,

                   2010      Brandon L. Black <blblack@gmail.com>
 
     This program is free software; you can redistribute it and/or modify
                   2010      Brandon L. Black <blblack@gmail.com>
 
     This program is free software; you can redistribute it and/or modify

diff --git a/src/sptps.h b/src/sptps.h
index bf3a3b96c1c209abb20323dccb6d09d7a51725f3..1fead07a0a4391a8a36916cddd1fa2bce3a30410 100644 (file)
--- a/src/sptps.h
+++ b/src/sptps.h
@@ -1,6 +1,6 @@
 /*
     sptps.h -- Simple Peer-to-Peer Security
 /*
     sptps.h -- Simple Peer-to-Peer Security

-    Copyright (C) 2011-2012 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2011-2013 Guus Sliepen <guus@tinc-vpn.org>,

 
     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
 
     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
index 06fee32f5a217861ad6a943bc66f66152a573868..12ca03c73135d8e6e80596fba7793b02580ac7af 100644 (file)
--- a/src/subnet.c
+++ b/src/subnet.c
@@ -1,6 +1,6 @@
 /*
     subnet.c -- handle subnet lookups and lists
 /*
     subnet.c -- handle subnet lookups and lists

-    Copyright (C) 2000-2012 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2013 Guus Sliepen <guus@tinc-vpn.org>,

                   2000-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
                   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
index afaeda3250f680d9b8293bce2a96639b16393389..7b44881f3cf842c1a8295e6f2430c59741c2820d 100644 (file)
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -1,6 +1,6 @@
 /*
     tincctl.c -- Controlling a running tincd
 /*
     tincctl.c -- Controlling a running tincd

-    Copyright (C) 2007-2012 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2007-2013 Guus Sliepen <guus@tinc-vpn.org>

 
     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
 
     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
index cd49400b6d5c718a63be13c4a6127bb177ae2f3d..ff893df6ddbe8674a6eb71f226c0f71523e1e894 100644 (file)
--- 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
 /*
     tincd.c -- the main file for tincd
     Copyright (C) 1998-2005 Ivo Timmermans

-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>

                   2008      Max Rijevski <maksuf@gmail.com>
                   2009      Michael Tokarev <mjt@tls.msk.ru>
                   2010      Julien Muchembled <jm@jmuchemb.eu>
                   2008      Max Rijevski <maksuf@gmail.com>
                   2009      Michael Tokarev <mjt@tls.msk.ru>
                   2010      Julien Muchembled <jm@jmuchemb.eu>

diff --git a/src/uml_device.c b/src/uml_device.c
index abedf1fb972e5addc5a1beaade67de9a993991a9..d06832b7b938a2e7459436389b46c43792a11a04 100644 (file)
--- 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,
 /*
     device.c -- UML network socket
     Copyright (C) 2002-2005 Ivo Timmermans,

-                  2002-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2002-2013 Guus Sliepen <guus@tinc-vpn.org>

 
     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
 
     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
index be53e0a255e90d7ac8389c85732ba5f6a6efcd9c..446ca1642218d8d23876049bd90663e970cd1c4e 100644 (file)
--- a/src/vde_device.c
+++ b/src/vde_device.c
@@ -1,6 +1,6 @@
 /*
     device.c -- VDE plug
 /*
     device.c -- VDE plug

-    Copyright (C) 2012 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2013 Guus Sliepen <guus@tinc-vpn.org>

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