From 9e6b12aa20e257ed0ef232c54e0f4eb7fe779a15 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 12 Aug 2006 09:12:34 +0200
Subject: [PATCH] Fixed converting the port number in the "connect from..." log
 message of SVDRP

---
 CONTRIBUTORS | 1 +
 HISTORY      | 5 +++++
 config.h     | 4 ++--
 svdrp.c      | 4 ++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index dced3ca0..97a16376 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1621,6 +1621,7 @@ Ville Skytt
  for fixing several spelling errors
  for reporting that the call to pthread_setschedparam(childTid, SCHED_RR, 0) in
  thread.c caused a compiler warning with g++ 4.1.1
+ for fixing converting the port number in the "connect from..." log message of SVDRP
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
diff --git a/HISTORY b/HISTORY
index 1a35c12a..d3ca8bf6 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4858,3 +4858,8 @@ Video Disk Recorder Revision History
   a negative number of minutes (reported by Udo Richter).
 - Fixed getting the next active timer when shutting down (thanks to Udo Richter).
 - Modified the cSVDRP::Close() function to avoid code duplication.
+
+2006-08-12: Version 1.4.1-4
+
+- Fixed converting the port number in the "connect from..." log message of SVDRP
+  (thanks to Ville Skyttä).
diff --git a/config.h b/config.h
index fd244cdf..82c06c60 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.264 2006/07/29 09:56:04 kls Exp $
+ * $Id: config.h 1.265 2006/08/12 09:10:11 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -21,7 +21,7 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.4.1-3"
+#define VDRVERSION  "1.4.1-4"
 #define VDRVERSNUM   10401  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
diff --git a/svdrp.c b/svdrp.c
index b2317527..8ca8afd1 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
  * and interact with the Video Disk Recorder - or write a full featured
  * graphical interface that sits on top of an SVDRP connection.
  *
- * $Id: svdrp.c 1.99 2006/08/06 09:17:58 kls Exp $
+ * $Id: svdrp.c 1.100 2006/08/12 09:09:55 kls Exp $
  */
 
 #include "svdrp.h"
@@ -120,7 +120,7 @@ int cSocket::Accept(void)
            close(newsock);
            newsock = -1;
            }
-        isyslog("connect from %s, port %hd - %s", inet_ntoa(clientname.sin_addr), ntohs(clientname.sin_port), accepted ? "accepted" : "DENIED");
+        isyslog("connect from %s, port %hu - %s", inet_ntoa(clientname.sin_addr), ntohs(clientname.sin_port), accepted ? "accepted" : "DENIED");
         }
      else if (errno != EINTR && errno != EAGAIN)
         LOG_ERROR;