From a70cc4a8b97eb2410755a96b9d2f73132a96c1a4 Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Sat, 6 Nov 2010 07:15:12 +0000
Subject: read svdrp default port from /etc/services (tcp:6419)

---
 lib/XXV/MODULES/SVDRP.pm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/XXV/MODULES/SVDRP.pm b/lib/XXV/MODULES/SVDRP.pm
index 1f35d21..7bc2bb0 100644
--- a/lib/XXV/MODULES/SVDRP.pm
+++ b/lib/XXV/MODULES/SVDRP.pm
@@ -132,6 +132,10 @@ sub _init {
         return 0;
     }
 
+    # read default port from /etc/services
+    $self->{defaultport} = getservbyname('svdrp', 'tcp');
+    $self->{defaultport} = 2001 unless($self->{defaultport});
+
     # Look for table or create this table
     my $erg = $self->{dbh}->do(qq|
       CREATE TABLE IF NOT EXISTS RECORDER (
@@ -139,7 +143,7 @@ sub _init {
           active enum('y', 'n') default 'y',
           master enum('y', 'n') default 'n',
           host varchar(100) NOT NULL default 'localhost',
-          port smallint unsigned default 2001,
+          port smallint unsigned default $self->{defaultport},
           cards varchar(100) default '',
           videodirectory text default '',
           PRIMARY KEY (id)
@@ -153,7 +157,7 @@ sub _init {
             active => 'y',
             master => 'y',
             host => 'localhost',
-            port => 2001,
+            port => $self->{defaultport},
             cards => '',
             videodirectory => '/var/lib/video'
         });
@@ -256,7 +260,7 @@ sub edit {
             typ     => 'integer',
             msg   => gettext("Used Port of SVDRP"),
             req   => gettext('This is required!'),
-            def   => $default->{port} || 2001,
+            def   => $default->{port} || $self->{defaultport},
             check   => sub{
                 my $value = int(shift);
                 if($value > 0 && $value < 65536) {
-- 
cgit v1.2.3