Updated version 0.7 from 'upstream/0.7'

with Debian dir f7472d5bcc10740151744430428b01f92443ba16

1 files changed, 23 insertions, 25 deletions

diff --git a/nat-traverse b/nat-traverse
index e829154..c5ab5d1 100755
--- a/nat-traverse
+++ b/nat-traverse
@@ -1,21 +1,20 @@
-#!/usr/bin/perl
-# nat-traverse -- Use of UDP to traverse NAT gateways
-# Copyright (C) 2005, 2012 Ingo Blechschmidt <iblech@web.de>
+#!/usr/bin/env perl
+# nat-traverse -- NAT gateway traversal utility
+# Copyright (C) 2005, 2012, 2017 Ingo Blechschmidt <iblech@speicherleck.de>
 #
 # 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 the Free Software Foundation; either version 2
+# as published by the Free Software Foundation; either version 3
 # of the License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 use warnings;
 use strict;
@@ -38,7 +37,7 @@ GetOptions(
   "timeout=i"          => \(my $TIMEOUT = 10),
   "quit-after-connect" => \my $QUIT_AFTER_CONNECT,
   "cmd=s"              => \my $CMD,
-  "version"            => sub { print "nat-traverse 0.6\n"; exit },
+  "version"            => sub { print "nat-traverse 0.7\n"; exit },
   "help"               => \&usage,
 ) or usage();
 usage() unless @ARGV == 1;
@@ -86,7 +85,7 @@ syswrite $sock, ACK_MAGIC;
 debug " done.\n";
 
 # Waiting for ACK packet so we see the connection is established.
-debug "Waiting for ACK (timeout: $TIMEOUT\Es)... ";
+debug "Waiting for ACK (timeout: ${TIMEOUT}s)... ";
 {
   local $SIG{ALRM} = sub { die " timeout.\n" };
   alarm $TIMEOUT;
@@ -155,7 +154,7 @@ if(defined $CMD) {
 
 # Display usage info.
 sub usage { print STDERR <<'USAGE'; exit }
-nat-traverse v0.6 -- Use of UDP to traverse NAT gateways
+nat-traverse v0.7 -- NAT gateway traversal utility
 
 Usage:
   user@left  $ nat-traverse [options] port1:natgw-of-right:port2
@@ -181,13 +180,13 @@ Available options:
   --help                This help.
 
 Options may be abbreviated to uniqueness.
-Run "perldoc nat-traverse" for more information.
+Run "man nat-traverse" for more information.
 USAGE
 
 
 =head1 NAME
 
-nat-traverse - Use of UDP to traverse NAT gateways
+nat-traverse - NAT gateway traversal utility
 
 =head1 SYNOPSIS
 
@@ -201,7 +200,7 @@ C<right>. See L</EXAMPLES> for more.
 
 =head1 VERSION
 
-This document describes nat-traverse v0.6.
+This document describes nat-traverse v0.7.
 
 =head1 DESCRIPTION
 
@@ -345,7 +344,7 @@ reliable streams, use PPP on top of nat-traverse, as described above.
 
 =head2 Setup of a VPN with OpenVPN
 
-You can use L<OpenVPN|http://openvpn.net/> over nat-traverse if you want to
+You can use L<OpenVPN|https://openvpn.net/> over nat-traverse if you want to
 have a I<secure> VPN.
 
 Using OpenVPN over nat-traverse requires only one change to OpenVPN's
@@ -402,30 +401,30 @@ are (in general) not predictable.
 =over
 
 =item L<RFC 1631 at
-http://www.ietf.org/rfc/rfc1631.txt|http://www.ietf.org/rfc/rfc1631.txt>
+https://www.ietf.org/rfc/rfc1631.txt|https://www.ietf.org/rfc/rfc1631.txt>
 
 The IP Network Address Translator (NAT). K. Egevang, P. Francis.  May 1994.
 (Obsoleted by RFC3022) (Status: INFORMATIONAL)
 
 =item L<RFC 3022 at
-http://www.ietf.org/rfc/rfc3022.txt|http://www.ietf.org/rfc/rfc3022.txt>
+https://www.ietf.org/rfc/rfc3022.txt|https://www.ietf.org/rfc/rfc3022.txt>
 
 Traditional IP Network Address Translator (Traditional NAT). P.  Srisuresh,
 K. Egevang. January 2001.  (Obsoletes RFC1631) (Status: INFORMATIONAL)
 
 =item L<RFC 1661 at
-http://www.ietf.org/rfc/rfc1661.txt|http://www.ietf.org/rfc/rfc1661.txt>
+https://www.ietf.org/rfc/rfc1661.txt|https://www.ietf.org/rfc/rfc1661.txt>
 
 The Point-to-Point Protocol (PPP). W. Simpson, Ed.. July 1994.  (Obsoletes
 RFC1548) (Updated by RFC2153) (Also STD0051) (Status: STANDARD)
 
-=item L<http://ppp.samba.org/>
+=item L<https://ppp.samba.org/>
 
 Website of Paul's PPP Package (open source implementation of the
 Point-to-Point Protocol (PPP) on Linux and Solaris)
 
 =item L<German talk about nat-traverse at
-http://linide.sourceforge.net/nat-traverse/nat-traverse-talk.pdf|http://linide.sourceforge.net/nat-traverse/nat-traverse-talk.pdf>
+https://www.speicherleck.de/iblech/nat-traverse/nat-traverse-talk.pdf|https://www.speicherleck.de/iblech/nat-traverse/nat-traverse-talk.pdf>
 
 Dieser Vortrag zeigt, wie man einen Tunnel zwischen zwei Computern, die
 beide hinter NAT-Gateways sitzen, hinbekommt. Dazu wird ein neues Programm
@@ -437,22 +436,21 @@ starten kann. Damit ist ein einfaches VPN schnell aufgebaut.
 
 =head1 AUTHOR
 
-Copyright (C) 2005, 2012 Ingo Blechschmidt, E<lt>iblech@web.deE<gt>.
+Copyright (C) 2005, 2012, 2017 Ingo Blechschmidt, E<lt>iblech@speicherleck.deE<gt>.
 
-You may want to visit nat-traverse's Freecode project page,
-L<http://freecode.com/projects/nat-traverse/>.
+The source code repository is hosted at L<https://gitlab.com/iblech/nat-traverse>.
 
 =head1 LICENSE
 
 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 the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
+Foundation; either version 3 of the License, or (at your option) any later
 version.
 
 This program is distributed in the hope that it will be useful, but WITHOUT ANY
 WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
-Street, Fifth Floor, Boston, MA  02110-1301, USA.
+Street, Fifth Floor, Boston, MA 02110-1301, USA.