Changed the default SVDRP port to 6419 (officially registered with ICANN/IANA)

6 files changed, 12 insertions, 9 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 2d741974..252d5d0b 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1358,6 +1358,7 @@ Christian Tramnitz <maillist@tramnitz.com>
  for terrestrial transponders
  for his support in debugging a problem in setting the source type for newly
  detected terrestrial transponders
+ for registering the default SVDRP port (6419) with ICANN/IANA
 
 Jens Rosenboom <me@jayr.de>
  for fixing the SVDRP command 'STAT DISK' to avoid a 'division by 0' in case
diff --git a/HISTORY b/HISTORY
index 800a52ec..59ec2e76 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6411,9 +6411,11 @@ Video Disk Recorder Revision History
 - The new setup option "Folders in timer menu" controls whether the file names in
   the timer menu are shown with their full folder path.
 
-2010-03-27: Version 1.7.15
+2010-04-02: Version 1.7.15
 
 - Added Macedonian language texts (thanks to Dimitar Petrovski).
 - Updated the Estonian OSD texts (thanks to Arthur Konovalov).
 - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
 - Added handling of EnhancedAC3DescriptorTag (thanks to Eric Valette).
+- The default SVDRP port is now 6419 (registered with ICANN/IANA by Christian Tramnitz).
+  Use '-p 2001' to switch back to the old port if necessary.
diff --git a/INSTALL b/INSTALL
index e0fc016a..ee4f64a4 100644
--- a/INSTALL
+++ b/INSTALL
@@ -66,7 +66,7 @@ messages (tail -f /var/log/messages) to see if there are any problems.
 
 The program can be controlled via a network connection to its SVDRP
 port ("Simple Video Disk Recorder Protocol"). By default, it listens
-on port 2001 (use the --port=PORT option to change this). For details
+on port 6419 (use the --port=PORT option to change this). For details
 about the SVDRP syntax see the source file 'svdrp.c'.
 
 WARNING: DUE TO THE OPEN SVDRP PORT THIS PROGRAM MAY CONSTITUTE A
diff --git a/svdrpsend.pl b/svdrpsend.pl
index 5efd504b..03d78fea 100755
--- a/svdrpsend.pl
+++ b/svdrpsend.pl
@@ -7,13 +7,13 @@ $Usage = qq{
 Usage: $0 options command...
 
 Options: -d hostname        destination hostname (default: localhost)
-         -p port            SVDRP port number (default: 2001)
+         -p port            SVDRP port number (default: 6419)
 };
 
 die $Usage if (!$ARGV[0] || !getopts("d:p:"));
 
 $Dest = $opt_d  || "localhost";
-$Port = $opt_p  || 2001;
+$Port = $opt_p  || 6419;
 $Cmd  = "@ARGV" || Error("missing command");
 
 $Timeout = 10; # max. seconds to wait for response
diff --git a/vdr.1 b/vdr.1
index 9bd1f0e7..ea93bdda 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 2.4 2010/01/02 12:08:40 kls Exp $
+.\" $Id: vdr.1 2.5 2010/04/02 12:22:08 kls Exp $
 .\"
 .TH vdr 1 "10 Feb 2008" "1.6" "Video Disk Recorder"
 .SH NAME
@@ -37,7 +37,7 @@ It can be controlled by the PC keyboard, a home built "Remote Control Unit"
 (RCU) or the "Linux Infrared Remote Control" (LIRC).
 
 Remote access is possible via the "Simple Video Disk Recorder Protocol" (SVDRP),
-which can be accessed on port 2001, for instance by \fBtelnet\fR.
+which can be accessed on port 6419, for instance by \fBtelnet\fR.
 .SH OPTIONS
 .TP
 .BI \-a\  cmd ,\ \-\-audio= cmd
@@ -124,7 +124,7 @@ Don't use the keyboard as an input device.
 .TP
 .BI \-p\  port ,\ \-\-port= port
 Use \fIport\fR for SVDRP. A value of \fB0\fR turns off SVDRP.
-The default SVDRP port is \fB2001\fR.
+The default SVDRP port is \fB6419\fR.
 You need to edit the file \fIsvdrphosts.conf\fR in order to enable
 access to the SVDRP port.
 .TP
diff --git a/vdr.c b/vdr.c
index e7abdcb9..4b196fad 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 2.17 2010/02/21 14:08:09 kls Exp $
+ * $Id: vdr.c 2.18 2010/04/02 12:22:11 kls Exp $
  */
 
 #include <getopt.h>
@@ -177,7 +177,7 @@ int main(int argc, char *argv[])
 
   // Command line options:
 
-#define DEFAULTSVDRPPORT 2001
+#define DEFAULTSVDRPPORT 6419
 #define DEFAULTWATCHDOG     0 // seconds
 #define DEFAULTCONFDIR CONFDIR
 #define DEFAULTPLUGINDIR PLUGINDIR