summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2007-06-23 09:43:55 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2007-06-23 09:43:55 +0200
commit95f4ddd4e5ce8f8816bd7206426337ce7f1e4f98 (patch)
tree8e9ccb6863e53c0442faf3b5ffb99a4eddaa9077
parent62f3d4c797185155ae0b84b3d3b1c397ab6561b3 (diff)
downloadvdr-95f4ddd4e5ce8f8816bd7206426337ce7f1e4f98.tar.gz
vdr-95f4ddd4e5ce8f8816bd7206426337ce7f1e4f98.tar.bz2
Fixed handling address masks in SVDRP host settings
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY1
-rw-r--r--config.c4
3 files changed, 4 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index e676a4f7..d68b0fa9 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2048,6 +2048,7 @@ Frank Schmirler <vdr@schmirler.de>
for fixing assigning schedules to channels in case there is no initial EPG information
for making entering text via the numeric keys check the characters against the
allowed characters
+ for fixing handling address masks in SVDRP host settings
Jörn Reder <joern@zyn.de>
for reporting that a recording may unnecessarily block a device with a CAM, while
diff --git a/HISTORY b/HISTORY
index fc012b5f..b9cedb81 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5266,3 +5266,4 @@ Video Disk Recorder Revision History
- Fixed a name clash between skincurses.c and the new cOsd position functions.
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
- Changed the parameter "OSD font size" to "Default font size" in "Setup/OSD".
+- Fixed handling address masks in SVDRP host settings (thanks to Frank Schmirler).
diff --git a/config.c b/config.c
index 529a8696..05f7f1ff 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: config.c 1.153 2007/06/17 11:54:54 kls Exp $
+ * $Id: config.c 1.154 2007/06/23 09:42:49 kls Exp $
*/
#include "config.h"
@@ -119,7 +119,7 @@ bool cSVDRPhost::Parse(const char *s)
bool cSVDRPhost::Accepts(in_addr_t Address)
{
- return (Address & mask) == addr.s_addr;
+ return (Address & mask) == (addr.s_addr & mask);
}
// -- cCommands --------------------------------------------------------------