diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 7969a3ef..05b8657e 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1937,3 +1937,6 @@ Anssi Hannula Antti Hartikainen for updating 'S13E' in 'sources.conf' + +Patrick Maier + for fixing handling network masks in the svdrphosts.conf file diff --git a/HISTORY b/HISTORY index 01bf71cf..530f0707 100644 --- a/HISTORY +++ b/HISTORY @@ -4818,3 +4818,5 @@ Video Disk Recorder Revision History true. - Newlines in title and short text of an EPG event are now changed into blanks only after all other fixes, because a short text might become a description. +- Fixed handling network masks in the svdrphosts.conf file (thanks to Patrick + Maier). diff --git a/config.c b/config.c index d89072b3..f3942668 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.145 2006/04/17 11:00:00 kls Exp $ + * $Id: config.c 1.146 2006/07/22 11:57:51 kls Exp $ */ #include "config.h" @@ -106,8 +106,10 @@ bool cSVDRPhost::Parse(const char *s) *(char *)p = 0; // yes, we know it's 'const' - will be restored! if (m == 0) mask = 0; - else - mask >>= (32 - m); + else { + mask <<= (32 - m); + mask = htonl(mask); + } } int result = inet_aton(s, &addr); if (p)