lagertonne/tinc
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Wiki Activity

Import Debian changes 1.0.7-1

Browse source 
tinc (1.0.7-1) unstable; urgency=low

  * New upstream release.
This commit is contained in:
Guus Sliepen 2007-01-05 15:55:42 +01:00
commit be5fbb7e93
17 changed files with 137 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
ChangeLog
View file

@ -1,3 +1,33 @@
------------------------------------------------------------------------
r1494 | guus | 2007-01-05 06:44:01 +0100 (vr, 05 jan 2007) | 2 lines
rename() cannot replace existing files on Windows.
------------------------------------------------------------------------
r1493 | guus | 2007-01-05 05:49:02 +0100 (vr, 05 jan 2007) | 4 lines
Fix generic BSD tun device to write only the actual packet length.
Due to a copy&paste bug, it tried to write a packet with the maximum size.
This was not a problem until the maximum size was increased to support VLANs.
------------------------------------------------------------------------
r1492 | guus | 2007-01-04 16:28:36 +0100 (do, 04 jan 2007) | 2 lines
Tapreader socket should be bound to localhost only.
------------------------------------------------------------------------
r1491 | guus | 2007-01-03 19:18:54 +0100 (wo, 03 jan 2007) | 5 lines
Use a ringbuffer in shared memory to transfer packets from the tapreader thread to the main thread.
It's a wonder it ever worked before. The socket that is created is not of a
datagram type, therefore packet boundaries were not preserved, which becomes
a problem as soon as the TAP-Win32 device receives packets in fast succession.
------------------------------------------------------------------------
r1490 | guus | 2006-12-18 18:38:05 +0100 (ma, 18 dec 2006) | 2 lines
Releasing 1.0.6.
------------------------------------------------------------------------ ------------------------------------------------------------------------
r1489 | guus | 2006-12-18 12:41:53 +0100 (ma, 18 dec 2006) | 2 lines r1489 | guus | 2006-12-18 12:41:53 +0100 (ma, 18 dec 2006) | 2 lines

2
Makefile.in
View file

@ -35,7 +35,7 @@ subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING ChangeLog \ $(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING ChangeLog \
INSTALL NEWS THANKS TODO config.guess config.rpath config.sub \ INSTALL NEWS THANKS config.guess config.rpath config.sub \
depcomp install-sh missing mkinstalldirs depcomp install-sh missing mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/attribute.m4 \ am__aclocal_m4_deps = $(top_srcdir)/m4/attribute.m4 \

7
NEWS
View file

@ -1,3 +1,10 @@
Version 1.0.7 Jan 5 2007
* Fixed a bug that caused slow network speeds on Windows.
* Fixed a bug that caused tinc unable to write packets to the tun device on
OpenBSD.
Version 1.0.6 Dec 18 2006 Version 1.0.6 Dec 18 2006
* More flexible detection of the LZO libraries when compiling. * More flexible detection of the LZO libraries when compiling.

4
README
View file

@ -1,4 +1,4 @@
This is the README file for tinc version 1.0.6. Installation This is the README file for tinc version 1.0.7. Installation
instructions may be found in the INSTALL file. instructions may be found in the INSTALL file.
tinc is Copyright (C) 1998-2006 by: tinc is Copyright (C) 1998-2006 by:
@ -55,7 +55,7 @@ should be changed into "Device", and "Device" should be changed into
Compatibility Compatibility
------------- -------------
Version 1.0.6 is compatible with 1.0pre8, 1.0 and later, but not with older Version 1.0.7 is compatible with 1.0pre8, 1.0 and later, but not with older
versions of tinc. versions of tinc.

3
TODO
View file

@ -1,3 +0,0 @@
TODO LIST
* Think of new things to do.

2
configure vendored
View file

@ -2107,7 +2107,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE=tinc PACKAGE=tinc
VERSION=1.0.6 VERSION=1.0.7
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF

2
configure.in
View file

@ -5,7 +5,7 @@ dnl $Id: configure.in 1488 2006-12-16 16:53:58Z guus $
AC_PREREQ(2.61) AC_PREREQ(2.61)
AC_INIT AC_INIT
AC_CONFIG_SRCDIR([src/tincd.c]) AC_CONFIG_SRCDIR([src/tincd.c])
AM_INIT_AUTOMAKE(tinc, 1.0.6) AM_INIT_AUTOMAKE(tinc, 1.0.7)
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
tinc (1.0.7-1) unstable; urgency=low
* New upstream release.
-- Guus Sliepen <guus@debian.org> Fri, 5 Jan 2007 15:55:42 +0100
tinc (1.0.6-1) unstable; urgency=low tinc (1.0.6-1) unstable; urgency=low
* New upstream release. * New upstream release.

BIN
doc/sample-config.tar.gz
View file

Binary file not shown.

2
doc/tinc.info
View file

@ -5,7 +5,7 @@ START-INFO-DIR-ENTRY
* tinc: (tinc). The tinc Manual. * tinc: (tinc). The tinc Manual.
END-INFO-DIR-ENTRY END-INFO-DIR-ENTRY
This is the info manual for tinc version 1.0.6, a Virtual Private This is the info manual for tinc version 1.0.7, a Virtual Private
Network daemon. Network daemon.
Copyright (C) 1998-2006 Ivo Timmermans, Guus Sliepen Copyright (C) 1998-2006 Ivo Timmermans, Guus Sliepen

BIN
po/nl.gmo
View file

Binary file not shown.

48
po/nl.po
View file

@ -1,13 +1,13 @@
# Dutch messages for tinc # Dutch messages for tinc
# Copyright (C) 1999-2006 Ivo Timmermans, Guus Sliepen. # Copyright (C) 1999-2007 Ivo Timmermans, Guus Sliepen.
# Ivo Timmermans <ivo@tinc-vpn.org>, 1999-2006. # Ivo Timmermans <ivo@tinc-vpn.org>, 1999-2006.
# Guus Sliepen <guus@tinc-vpn.org>, 2000-2006. # Guus Sliepen <guus@tinc-vpn.org>, 2000-2007.
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: tinc 1.0-svn\n" "Project-Id-Version: tinc 1.0-svn\n"
"Report-Msgid-Bugs-To: tinc-devel@tinc-vpn.org\n" "Report-Msgid-Bugs-To: tinc-devel@tinc-vpn.org\n"
"POT-Creation-Date: 2006-12-18 13:32+0100\n" "POT-Creation-Date: 2007-01-05 14:14+0100\n"
"PO-Revision-Date: 2006-11-11 16:26+0100\n" "PO-Revision-Date: 2007-01-05 14:14+0100\n"
"Last-Translator: Guus Sliepen <guus@tinc-vpn.org>\n" "Last-Translator: Guus Sliepen <guus@tinc-vpn.org>\n"
"Language-Team: Dutch\n" "Language-Team: Dutch\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -291,9 +291,9 @@ msgstr "Instellen prioriteit uitgaand pakket op %d"
#: src/net_socket.c:158 src/tincd.c:435 src/tincd.c:472 src/process.c:198 #: src/net_socket.c:158 src/tincd.c:435 src/tincd.c:472 src/process.c:198
#: src/process.c:231 src/process.c:428 src/bsd/device.c:93 #: src/process.c:231 src/process.c:428 src/bsd/device.c:93
#: src/bsd/device.c:112 src/cygwin/device.c:140 src/cygwin/device.c:171 #: src/bsd/device.c:112 src/cygwin/device.c:140 src/cygwin/device.c:171
#: src/mingw/device.c:66 src/mingw/device.c:75 src/mingw/device.c:80 #: src/mingw/device.c:73 src/mingw/device.c:82 src/mingw/device.c:87
#: src/mingw/device.c:236 src/mingw/device.c:243 src/mingw/device.c:248 #: src/mingw/device.c:256 src/mingw/device.c:263 src/mingw/device.c:268
#: src/mingw/device.c:255 src/mingw/device.c:264 src/mingw/device.c:271 #: src/mingw/device.c:275 src/mingw/device.c:284 src/mingw/device.c:291
#: src/uml_socket/device.c:89 src/uml_socket/device.c:103 #: src/uml_socket/device.c:89 src/uml_socket/device.c:103
#: src/uml_socket/device.c:130 src/uml_socket/device.c:194 #: src/uml_socket/device.c:130 src/uml_socket/device.c:194
#, c-format #, c-format
@ -982,14 +982,14 @@ msgstr "%s versie %s (gemaakt %s %s, protocol %d)\n"
#: src/tincd.c:411 #: src/tincd.c:411
#, c-format #, c-format
msgid "" msgid ""
"Copyright (C) 1998-2006 Ivo Timmermans, Guus Sliepen and others.\n" "Copyright (C) 1998-2007 Ivo Timmermans, Guus Sliepen and others.\n"
"See the AUTHORS file for a complete list.\n" "See the AUTHORS file for a complete list.\n"
"\n" "\n"
"tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n" "tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n"
"and you are welcome to redistribute it under certain conditions;\n" "and you are welcome to redistribute it under certain conditions;\n"
"see the file COPYING for details.\n" "see the file COPYING for details.\n"
msgstr "" msgstr ""
"Copyright (C) 1998-2006 Ivo Timmermans, Guus Sliepen en anderen.\n" "Copyright (C) 1998-2007 Ivo Timmermans, Guus Sliepen en anderen.\n"
"Zie het bestand AUTHORS voor een volledige lijst.\n" "Zie het bestand AUTHORS voor een volledige lijst.\n"
"\n" "\n"
"tinc wordt gedistribueerd ZONDER ENIGE GARANTIE. Dit is vrije " "tinc wordt gedistribueerd ZONDER ENIGE GARANTIE. Dit is vrije "
@ -1368,22 +1368,22 @@ msgstr "%s is een %s"
#: src/linux/device.c:133 src/linux/device.c:144 src/linux/device.c:155 #: src/linux/device.c:133 src/linux/device.c:144 src/linux/device.c:155
#: src/solaris/device.c:125 src/bsd/device.c:152 src/bsd/device.c:181 #: src/solaris/device.c:125 src/bsd/device.c:152 src/bsd/device.c:181
#: src/bsd/device.c:210 src/cygwin/device.c:239 src/mingw/device.c:103 #: src/bsd/device.c:210 src/cygwin/device.c:239 src/mingw/device.c:110
#: src/mingw/device.c:303 src/raw_socket/device.c:102 #: src/mingw/device.c:323 src/raw_socket/device.c:102
#: src/uml_socket/device.c:239 #: src/uml_socket/device.c:239
#, c-format #, c-format
msgid "Error while reading from %s %s: %s" msgid "Error while reading from %s %s: %s"
msgstr "Fout tijdens lezen van %s %s: %s" msgstr "Fout tijdens lezen van %s %s: %s"
#: src/linux/device.c:166 src/solaris/device.c:150 src/bsd/device.c:224 #: src/linux/device.c:166 src/solaris/device.c:150 src/bsd/device.c:224
#: src/cygwin/device.c:248 src/mingw/device.c:312 src/raw_socket/device.c:111 #: src/cygwin/device.c:248 src/mingw/device.c:333 src/raw_socket/device.c:111
#: src/uml_socket/device.c:249 #: src/uml_socket/device.c:249
#, c-format #, c-format
msgid "Read packet of %d bytes from %s" msgid "Read packet of %d bytes from %s"
msgstr "Pakket van %d bytes gelezen van %s" msgstr "Pakket van %d bytes gelezen van %s"
#: src/linux/device.c:176 src/solaris/device.c:160 src/bsd/device.c:234 #: src/linux/device.c:176 src/solaris/device.c:160 src/bsd/device.c:234
#: src/cygwin/device.c:260 src/mingw/device.c:325 src/raw_socket/device.c:121 #: src/cygwin/device.c:260 src/mingw/device.c:346 src/raw_socket/device.c:121
#: src/uml_socket/device.c:267 #: src/uml_socket/device.c:267
#, c-format #, c-format
msgid "Writing packet of %d bytes to %s" msgid "Writing packet of %d bytes to %s"
@ -1397,21 +1397,21 @@ msgid "Can't write to %s %s: %s"
msgstr "Kan niet schrijven naar %s %s: %s" msgstr "Kan niet schrijven naar %s %s: %s"
#: src/linux/device.c:215 src/solaris/device.c:178 src/bsd/device.c:296 #: src/linux/device.c:215 src/solaris/device.c:178 src/bsd/device.c:296
#: src/cygwin/device.c:277 src/mingw/device.c:342 src/raw_socket/device.c:139 #: src/cygwin/device.c:277 src/mingw/device.c:363 src/raw_socket/device.c:139
#: src/uml_socket/device.c:288 #: src/uml_socket/device.c:288
#, c-format #, c-format
msgid "Statistics for %s %s:" msgid "Statistics for %s %s:"
msgstr "Statistieken voor %s %s:" msgstr "Statistieken voor %s %s:"
#: src/linux/device.c:216 src/solaris/device.c:179 src/bsd/device.c:297 #: src/linux/device.c:216 src/solaris/device.c:179 src/bsd/device.c:297
#: src/cygwin/device.c:278 src/mingw/device.c:343 src/raw_socket/device.c:140 #: src/cygwin/device.c:278 src/mingw/device.c:364 src/raw_socket/device.c:140
#: src/uml_socket/device.c:289 #: src/uml_socket/device.c:289
#, c-format #, c-format
msgid " total bytes in: %10d" msgid " total bytes in: %10d"
msgstr " totaal aantal bytes in: %10d" msgstr " totaal aantal bytes in: %10d"
#: src/linux/device.c:217 src/solaris/device.c:180 src/bsd/device.c:298 #: src/linux/device.c:217 src/solaris/device.c:180 src/bsd/device.c:298
#: src/cygwin/device.c:279 src/mingw/device.c:344 src/raw_socket/device.c:141 #: src/cygwin/device.c:279 src/mingw/device.c:365 src/raw_socket/device.c:141
#: src/uml_socket/device.c:290 #: src/uml_socket/device.c:290
#, c-format #, c-format
msgid " total bytes out: %10d" msgid " total bytes out: %10d"
@ -1475,7 +1475,7 @@ msgid "Unknown address family %x while reading packet from %s %s"
msgstr "Onbekende adresfamilie %x tijdens ontvangst pakket van %s %s" msgstr "Onbekende adresfamilie %x tijdens ontvangst pakket van %s %s"
#: src/bsd/device.c:240 src/bsd/device.c:277 src/cygwin/device.c:264 #: src/bsd/device.c:240 src/bsd/device.c:277 src/cygwin/device.c:264
#: src/mingw/device.c:329 #: src/mingw/device.c:350
#, c-format #, c-format
msgid "Error while writing to %s %s: %s" msgid "Error while writing to %s %s: %s"
msgstr "Fout tijdens schrijven naar %s %s: %s" msgstr "Fout tijdens schrijven naar %s %s: %s"
@ -1485,12 +1485,12 @@ msgstr "Fout tijdens schrijven naar %s %s: %s"
msgid "Unknown address family %x while writing packet to %s %s" msgid "Unknown address family %x while writing packet to %s %s"
msgstr "Onbekende adresfamiliy %x tijdens versturen pakket naar %s %s" msgstr "Onbekende adresfamiliy %x tijdens versturen pakket naar %s %s"
#: src/cygwin/device.c:71 src/mingw/device.c:147 #: src/cygwin/device.c:71 src/mingw/device.c:157
#, c-format #, c-format
msgid "Unable to read registry: %s" msgid "Unable to read registry: %s"
msgstr "Kon registry niet lezen: %s" msgstr "Kon registry niet lezen: %s"
#: src/cygwin/device.c:123 src/mingw/device.c:198 #: src/cygwin/device.c:123 src/mingw/device.c:208
msgid "No Windows tap device found!" msgid "No Windows tap device found!"
msgstr "Geen Windows tap apparaat gevonden!" msgstr "Geen Windows tap apparaat gevonden!"
@ -1499,7 +1499,7 @@ msgstr "Geen Windows tap apparaat gevonden!"
msgid "Could not open Windows tap device %s (%s) for writing: %s" msgid "Could not open Windows tap device %s (%s) for writing: %s"
msgstr "Kon Windows tap apparaat %s (%s) niet openen om te schrijven: %s" msgstr "Kon Windows tap apparaat %s (%s) niet openen om te schrijven: %s"
#: src/cygwin/device.c:158 src/mingw/device.c:223 #: src/cygwin/device.c:158 src/mingw/device.c:233
#, c-format #, c-format
msgid "Could not get MAC address from Windows tap device %s (%s): %s" msgid "Could not get MAC address from Windows tap device %s (%s): %s"
msgstr "Kon MAC adres niet achterhalen van Windows tap apparaat %s (%s): %s" msgstr "Kon MAC adres niet achterhalen van Windows tap apparaat %s (%s): %s"
@ -1517,20 +1517,20 @@ msgstr "Taplezer is geforked en draait."
msgid "Tap reader failed!" msgid "Tap reader failed!"
msgstr "Taplezer faalde!" msgstr "Taplezer faalde!"
#: src/cygwin/device.c:214 src/mingw/device.c:282 #: src/cygwin/device.c:214 src/mingw/device.c:302
msgid "Windows tap device" msgid "Windows tap device"
msgstr "Windows tap apparaat" msgstr "Windows tap apparaat"
#: src/cygwin/device.c:216 src/mingw/device.c:284 #: src/cygwin/device.c:216 src/mingw/device.c:304
#, c-format #, c-format
msgid "%s (%s) is a %s" msgid "%s (%s) is a %s"
msgstr "%s (%s) is een %s" msgstr "%s (%s) is een %s"
#: src/mingw/device.c:84 #: src/mingw/device.c:91
msgid "Tap reader running" msgid "Tap reader running"
msgstr "Taplezer draait" msgstr "Taplezer draait"
#: src/mingw/device.c:216 #: src/mingw/device.c:226
#, c-format #, c-format
msgid "%s (%s) is not a usable Windows tap device: %s" msgid "%s (%s) is not a usable Windows tap device: %s"
msgstr "%s (%s) is geen bruikbaar Windows tap apparaat: %s" msgstr "%s (%s) is geen bruikbaar Windows tap apparaat: %s"

40
po/tinc.pot
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tinc-devel@tinc-vpn.org\n" "Report-Msgid-Bugs-To: tinc-devel@tinc-vpn.org\n"
"POT-Creation-Date: 2006-12-18 13:32+0100\n" "POT-Creation-Date: 2007-01-05 14:14+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -283,9 +283,9 @@ msgstr ""
#: src/net_socket.c:158 src/tincd.c:435 src/tincd.c:472 src/process.c:198 #: src/net_socket.c:158 src/tincd.c:435 src/tincd.c:472 src/process.c:198
#: src/process.c:231 src/process.c:428 src/bsd/device.c:93 #: src/process.c:231 src/process.c:428 src/bsd/device.c:93
#: src/bsd/device.c:112 src/cygwin/device.c:140 src/cygwin/device.c:171 #: src/bsd/device.c:112 src/cygwin/device.c:140 src/cygwin/device.c:171
#: src/mingw/device.c:66 src/mingw/device.c:75 src/mingw/device.c:80 #: src/mingw/device.c:73 src/mingw/device.c:82 src/mingw/device.c:87
#: src/mingw/device.c:236 src/mingw/device.c:243 src/mingw/device.c:248 #: src/mingw/device.c:256 src/mingw/device.c:263 src/mingw/device.c:268
#: src/mingw/device.c:255 src/mingw/device.c:264 src/mingw/device.c:271 #: src/mingw/device.c:275 src/mingw/device.c:284 src/mingw/device.c:291
#: src/uml_socket/device.c:89 src/uml_socket/device.c:103 #: src/uml_socket/device.c:89 src/uml_socket/device.c:103
#: src/uml_socket/device.c:130 src/uml_socket/device.c:194 #: src/uml_socket/device.c:130 src/uml_socket/device.c:194
#, c-format #, c-format
@ -944,7 +944,7 @@ msgstr ""
#: src/tincd.c:411 #: src/tincd.c:411
#, c-format #, c-format
msgid "" msgid ""
"Copyright (C) 1998-2006 Ivo Timmermans, Guus Sliepen and others.\n" "Copyright (C) 1998-2007 Ivo Timmermans, Guus Sliepen and others.\n"
"See the AUTHORS file for a complete list.\n" "See the AUTHORS file for a complete list.\n"
"\n" "\n"
"tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n" "tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n"
@ -1308,22 +1308,22 @@ msgstr ""
#: src/linux/device.c:133 src/linux/device.c:144 src/linux/device.c:155 #: src/linux/device.c:133 src/linux/device.c:144 src/linux/device.c:155
#: src/solaris/device.c:125 src/bsd/device.c:152 src/bsd/device.c:181 #: src/solaris/device.c:125 src/bsd/device.c:152 src/bsd/device.c:181
#: src/bsd/device.c:210 src/cygwin/device.c:239 src/mingw/device.c:103 #: src/bsd/device.c:210 src/cygwin/device.c:239 src/mingw/device.c:110
#: src/mingw/device.c:303 src/raw_socket/device.c:102 #: src/mingw/device.c:323 src/raw_socket/device.c:102
#: src/uml_socket/device.c:239 #: src/uml_socket/device.c:239
#, c-format #, c-format
msgid "Error while reading from %s %s: %s" msgid "Error while reading from %s %s: %s"
msgstr "" msgstr ""
#: src/linux/device.c:166 src/solaris/device.c:150 src/bsd/device.c:224 #: src/linux/device.c:166 src/solaris/device.c:150 src/bsd/device.c:224
#: src/cygwin/device.c:248 src/mingw/device.c:312 src/raw_socket/device.c:111 #: src/cygwin/device.c:248 src/mingw/device.c:333 src/raw_socket/device.c:111
#: src/uml_socket/device.c:249 #: src/uml_socket/device.c:249
#, c-format #, c-format
msgid "Read packet of %d bytes from %s" msgid "Read packet of %d bytes from %s"
msgstr "" msgstr ""
#: src/linux/device.c:176 src/solaris/device.c:160 src/bsd/device.c:234 #: src/linux/device.c:176 src/solaris/device.c:160 src/bsd/device.c:234
#: src/cygwin/device.c:260 src/mingw/device.c:325 src/raw_socket/device.c:121 #: src/cygwin/device.c:260 src/mingw/device.c:346 src/raw_socket/device.c:121
#: src/uml_socket/device.c:267 #: src/uml_socket/device.c:267
#, c-format #, c-format
msgid "Writing packet of %d bytes to %s" msgid "Writing packet of %d bytes to %s"
@ -1337,21 +1337,21 @@ msgid "Can't write to %s %s: %s"
msgstr "" msgstr ""
#: src/linux/device.c:215 src/solaris/device.c:178 src/bsd/device.c:296 #: src/linux/device.c:215 src/solaris/device.c:178 src/bsd/device.c:296
#: src/cygwin/device.c:277 src/mingw/device.c:342 src/raw_socket/device.c:139 #: src/cygwin/device.c:277 src/mingw/device.c:363 src/raw_socket/device.c:139
#: src/uml_socket/device.c:288 #: src/uml_socket/device.c:288
#, c-format #, c-format
msgid "Statistics for %s %s:" msgid "Statistics for %s %s:"
msgstr "" msgstr ""
#: src/linux/device.c:216 src/solaris/device.c:179 src/bsd/device.c:297 #: src/linux/device.c:216 src/solaris/device.c:179 src/bsd/device.c:297
#: src/cygwin/device.c:278 src/mingw/device.c:343 src/raw_socket/device.c:140 #: src/cygwin/device.c:278 src/mingw/device.c:364 src/raw_socket/device.c:140
#: src/uml_socket/device.c:289 #: src/uml_socket/device.c:289
#, c-format #, c-format
msgid " total bytes in: %10d" msgid " total bytes in: %10d"
msgstr "" msgstr ""
#: src/linux/device.c:217 src/solaris/device.c:180 src/bsd/device.c:298 #: src/linux/device.c:217 src/solaris/device.c:180 src/bsd/device.c:298
#: src/cygwin/device.c:279 src/mingw/device.c:344 src/raw_socket/device.c:141 #: src/cygwin/device.c:279 src/mingw/device.c:365 src/raw_socket/device.c:141
#: src/uml_socket/device.c:290 #: src/uml_socket/device.c:290
#, c-format #, c-format
msgid " total bytes out: %10d" msgid " total bytes out: %10d"
@ -1415,7 +1415,7 @@ msgid "Unknown address family %x while reading packet from %s %s"
msgstr "" msgstr ""
#: src/bsd/device.c:240 src/bsd/device.c:277 src/cygwin/device.c:264 #: src/bsd/device.c:240 src/bsd/device.c:277 src/cygwin/device.c:264
#: src/mingw/device.c:329 #: src/mingw/device.c:350
#, c-format #, c-format
msgid "Error while writing to %s %s: %s" msgid "Error while writing to %s %s: %s"
msgstr "" msgstr ""
@ -1425,12 +1425,12 @@ msgstr ""
msgid "Unknown address family %x while writing packet to %s %s" msgid "Unknown address family %x while writing packet to %s %s"
msgstr "" msgstr ""
#: src/cygwin/device.c:71 src/mingw/device.c:147 #: src/cygwin/device.c:71 src/mingw/device.c:157
#, c-format #, c-format
msgid "Unable to read registry: %s" msgid "Unable to read registry: %s"
msgstr "" msgstr ""
#: src/cygwin/device.c:123 src/mingw/device.c:198 #: src/cygwin/device.c:123 src/mingw/device.c:208
msgid "No Windows tap device found!" msgid "No Windows tap device found!"
msgstr "" msgstr ""
@ -1439,7 +1439,7 @@ msgstr ""
msgid "Could not open Windows tap device %s (%s) for writing: %s" msgid "Could not open Windows tap device %s (%s) for writing: %s"
msgstr "" msgstr ""
#: src/cygwin/device.c:158 src/mingw/device.c:223 #: src/cygwin/device.c:158 src/mingw/device.c:233
#, c-format #, c-format
msgid "Could not get MAC address from Windows tap device %s (%s): %s" msgid "Could not get MAC address from Windows tap device %s (%s): %s"
msgstr "" msgstr ""
@ -1457,20 +1457,20 @@ msgstr ""
msgid "Tap reader failed!" msgid "Tap reader failed!"
msgstr "" msgstr ""
#: src/cygwin/device.c:214 src/mingw/device.c:282 #: src/cygwin/device.c:214 src/mingw/device.c:302
msgid "Windows tap device" msgid "Windows tap device"
msgstr "" msgstr ""
#: src/cygwin/device.c:216 src/mingw/device.c:284 #: src/cygwin/device.c:216 src/mingw/device.c:304
#, c-format #, c-format
msgid "%s (%s) is a %s" msgid "%s (%s) is a %s"
msgstr "" msgstr ""
#: src/mingw/device.c:84 #: src/mingw/device.c:91
msgid "Tap reader running" msgid "Tap reader running"
msgstr "" msgstr ""
#: src/mingw/device.c:216 #: src/mingw/device.c:226
#, c-format #, c-format
msgid "%s (%s) is not a usable Windows tap device: %s" msgid "%s (%s) is not a usable Windows tap device: %s"
msgstr "" msgstr ""

4
src/bsd/device.c
View file

@ -1,7 +1,7 @@
/* /*
device.c -- Interaction BSD tun/tap device device.c -- Interaction BSD tun/tap device
Copyright (C) 2001-2005 Ivo Timmermans, Copyright (C) 2001-2005 Ivo Timmermans,
2001-2006 Guus Sliepen <guus@tinc-vpn.org> 2001-2007 Guus Sliepen <guus@tinc-vpn.org>
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@ -245,7 +245,7 @@ bool write_packet(vpn_packet_t *packet)
case DEVICE_TYPE_TUNIFHEAD: { case DEVICE_TYPE_TUNIFHEAD: {
u_int32_t type; u_int32_t type;
struct iovec vector[2] = {{&type, sizeof(type)}, {packet->data + 14, MTU - 14}}; struct iovec vector[2] = {{&type, sizeof(type)}, {packet->data + 14, packet->len - 14}};
int af; int af;
af = (packet->data[12] << 8) + packet->data[13]; af = (packet->data[12] << 8) + packet->data[13];

5
src/graph.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: graph.c 1476 2006-12-12 14:54:39Z guus $ $Id: graph.c 1494 2007-01-05 05:44:01Z guus $
*/ */
/* We need to generate two trees from the graph: /* We need to generate two trees from the graph:
@ -374,6 +374,9 @@ void dump_graph(void)
pclose(file); pclose(file);
} else { } else {
fclose(file); fclose(file);
#ifdef HAVE_MINGW
unlink(filename);
#endif
rename(tmpname, filename); rename(tmpname, filename);
free(tmpname); free(tmpname);
} }

49
src/mingw/device.c
View file

@ -1,7 +1,7 @@
/* /*
device.c -- Interaction with Windows tap driver in a MinGW environment device.c -- Interaction with Windows tap driver in a MinGW environment
Copyright (C) 2002-2005 Ivo Timmermans, Copyright (C) 2002-2005 Ivo Timmermans,
2002-2006 Guus Sliepen <guus@tinc-vpn.org> 2002-2007 Guus Sliepen <guus@tinc-vpn.org>
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: device.c 1452 2006-04-26 13:52:58Z guus $ $Id: device.c 1496 2007-01-05 13:18:36Z guus $
*/ */
#include "system.h" #include "system.h"
@ -45,16 +45,23 @@ static int device_total_out = 0;
extern char *myport; extern char *myport;
static struct packetbuf {
uint8_t data[MTU];
length_t len;
} *bufs;
static int nbufs = 64;
DWORD WINAPI tapreader(void *bla) { DWORD WINAPI tapreader(void *bla) {
int sock, err, status; int sock, err, status;
struct addrinfo *ai; struct addrinfo *ai;
struct addrinfo hint = { struct addrinfo hint = {
.ai_family = AF_UNSPEC, .ai_family = AF_UNSPEC,
.ai_socktype = SOCK_DGRAM, .ai_socktype = SOCK_STREAM,
.ai_protocol = IPPROTO_UDP, .ai_protocol = IPPROTO_TCP,
.ai_flags = 0, .ai_flags = 0,
}; };
char buf[MTU]; unsigned char bufno = 0;
long len; long len;
OVERLAPPED overlapped; OVERLAPPED overlapped;
@ -67,7 +74,7 @@ DWORD WINAPI tapreader(void *bla) {
return -1; return -1;
} }
sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); sock = socket(ai->ai_family, SOCK_STREAM, IPPROTO_TCP);
freeaddrinfo(ai); freeaddrinfo(ai);
@ -92,7 +99,7 @@ DWORD WINAPI tapreader(void *bla) {
overlapped.OffsetHigh = 0; overlapped.OffsetHigh = 0;
ResetEvent(overlapped.hEvent); ResetEvent(overlapped.hEvent);
status = ReadFile(device_handle, buf, sizeof(buf), &len, &overlapped); status = ReadFile(device_handle, bufs[bufno].data, MTU, &len, &overlapped);
if(!status) { if(!status) {
if(GetLastError() == ERROR_IO_PENDING) { if(GetLastError() == ERROR_IO_PENDING) {
@ -106,8 +113,11 @@ DWORD WINAPI tapreader(void *bla) {
} }
} }
if(send(sock, buf, len, 0) <= 0) bufs[bufno].len = len;
if(send(sock, &bufno, 1, 0) <= 0)
return -1; return -1;
if(++bufno >= nbufs)
bufno = 0;
} }
} }
@ -131,8 +141,8 @@ bool setup_device(void)
struct addrinfo *ai; struct addrinfo *ai;
struct addrinfo hint = { struct addrinfo hint = {
.ai_family = AF_UNSPEC, .ai_family = AF_UNSPEC,
.ai_socktype = SOCK_DGRAM, .ai_socktype = SOCK_STREAM,
.ai_protocol = IPPROTO_UDP, .ai_protocol = IPPROTO_TCP,
.ai_flags = 0, .ai_flags = 0,
}; };
@ -228,6 +238,16 @@ bool setup_device(void)
overwrite_mac = 1; overwrite_mac = 1;
} }
/* Set up ringbuffer */
get_config_int(lookup_config(config_tree, "RingBufferSize"), &nbufs);
if(nbufs <= 1)
nbufs = 1;
else if(nbufs > 256)
nbufs = 256;
bufs = xmalloc_and_zero(nbufs * sizeof *bufs);
/* Create a listening socket */ /* Create a listening socket */
err = getaddrinfo(NULL, myport, &hint, &ai); err = getaddrinfo(NULL, myport, &hint, &ai);
@ -237,7 +257,7 @@ bool setup_device(void)
return false; return false;
} }
sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); sock = socket(ai->ai_family, SOCK_STREAM, IPPROTO_TCP);
if(sock < 0) { if(sock < 0) {
logger(LOG_ERR, _("System call `%s' failed: %s"), "socket", strerror(errno)); logger(LOG_ERR, _("System call `%s' failed: %s"), "socket", strerror(errno));
@ -295,17 +315,18 @@ void close_device(void)
bool read_packet(vpn_packet_t *packet) bool read_packet(vpn_packet_t *packet)
{ {
int lenin; unsigned char bufno;
cp(); cp();
if((lenin = recv(device_fd, packet->data, MTU, 0)) <= 0) { if((recv(device_fd, &bufno, 1, 0)) <= 0) {
logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno)); device, strerror(errno));
return false; return false;
} }
packet->len = lenin; packet->len = bufs[bufno].len;
memcpy(packet->data, bufs[bufno].data, bufs[bufno].len);
device_total_in += packet->len; device_total_in += packet->len;

6
src/tincd.c
View file

@ -1,7 +1,7 @@
/* /*
tincd.c -- the main file for tincd tincd.c -- the main file for tincd
Copyright (C) 1998-2005 Ivo Timmermans Copyright (C) 1998-2005 Ivo Timmermans
2000-2006 Guus Sliepen <guus@tinc-vpn.org> 2000-2007 Guus Sliepen <guus@tinc-vpn.org>
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: tincd.c 1474 2006-11-29 17:18:39Z guus $ $Id: tincd.c 1496 2007-01-05 13:18:36Z guus $
*/ */
#include "system.h" #include "system.h"
@ -408,7 +408,7 @@ int main(int argc, char **argv)
if(show_version) { if(show_version) {
printf(_("%s version %s (built %s %s, protocol %d)\n"), PACKAGE, printf(_("%s version %s (built %s %s, protocol %d)\n"), PACKAGE,
VERSION, __DATE__, __TIME__, PROT_CURRENT); VERSION, __DATE__, __TIME__, PROT_CURRENT);
printf(_("Copyright (C) 1998-2006 Ivo Timmermans, Guus Sliepen and others.\n" printf(_("Copyright (C) 1998-2007 Ivo Timmermans, Guus Sliepen and others.\n"
"See the AUTHORS file for a complete list.\n\n" "See the AUTHORS file for a complete list.\n\n"
"tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n" "tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n"
"and you are welcome to redistribute it under certain conditions;\n" "and you are welcome to redistribute it under certain conditions;\n"