mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
Version 0.64
- NOTE: If you are using DVB driver version 0.7 you need to load the dvb.o
module with option outstream=0, so your insmod statement should read
'insmod dvb.o outstream=0'. This is currently necessary because 'vdr'
still works with AV_PES data.
- Video files now have the 'group read' bit set.
- Fixed handling errors in 'readstring()'.
- Handling SIGPIPE and re-establishing handler after intercepting a signal.
- The configuration files are now by default read from the video directory.
This can be changed by using the new '-c' option. Make sure you copy your
current '*.conf' files to your video directory ('/video' by default), or
use "-c ." to get the old behaviour of loading the configuration files
from the current directory.
- Waiting for input is now handled by a common function, which improves
response time on user actions. As a consequence the EIT data may sometimes
not be displayed, but this will change later when cEIT runs as a separate
thread.
- The new SVDRP command 'HITK' (thanks to Guido Fiala!) can be used to 'hit'
a remote control key. Establish an SVDRP connection and enter HITK without
a parameter for a list of all valid key names.
- The new SVDRP command 'GRAB' (thanks to Guido Fiala!) can be used to grab
the current frame and save it to a file.
- The new SVDRP commands 'OVL*' can be used to control video overlays (thanks
to Guido Fiala!). This is mainly for use in the 'kvdr' tool (see the 'kvdr'
page at http://www.s.netic.de/gfiala).
- If the name of the video directory used with the '-v' option had trailing
slashes, the recording file names have been damaged. Trailing slashes are
now silently removed.
- Fixed a buffer overflow in EIT parsing.
- Added a security warning regarding SVDRP to the INSTALL file.
- Fixed 'confirm' dialog.
- The daemon mode (option '-d') now no longer works with REMOTE=KBD (there
is no stdin in daemon mode, so KBD makes no sense - plus it sometimes
crashed).
This commit is contained in:
19
eit.c
19
eit.c
@@ -13,7 +13,7 @@
|
||||
* the Free Software Foundation; either version 2 of the License, or *
|
||||
* (at your option) any later version. *
|
||||
* *
|
||||
* $Id: eit.c 1.1 2000/09/03 10:22:25 kls Exp $
|
||||
* $Id: eit.c 1.3 2000/09/17 15:23:05 kls Exp $
|
||||
***************************************************************************/
|
||||
|
||||
#include "eit.h"
|
||||
@@ -22,7 +22,6 @@
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <time.h>
|
||||
#include <sys/poll.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <dvb_comcode.h>
|
||||
#include "tools.h"
|
||||
@@ -253,15 +252,12 @@ int cEIT::GetSection(unsigned char *buf, ushort PID, unsigned char sec)
|
||||
int seclen=0;
|
||||
unsigned short handle, pid;
|
||||
unsigned char section, sectionnum=0xff, maxsec=0;
|
||||
struct pollfd pfd;
|
||||
|
||||
if ((handle = SetBitFilter(PID, (sec<<8)|0x00ff, SECTION_CONTINUOS))==0xffff)
|
||||
return -1;
|
||||
|
||||
seclen=0;
|
||||
pfd.fd=fsvbi;
|
||||
pfd.events=POLLIN;
|
||||
if (poll(&pfd, 1, 20000)==0)
|
||||
if (!cFile::AnyFileReady(fsvbi, 20000))
|
||||
{
|
||||
//cerr << "Timeout\n";
|
||||
return -1;
|
||||
@@ -312,13 +308,12 @@ char * cEIT::mjd2string(unsigned short mjd)
|
||||
/** */
|
||||
int cEIT::GetEIT()
|
||||
{
|
||||
unsigned char buf[1024];
|
||||
unsigned char buf[4096+1]; // max. allowed size for any EIT section (+1 for safety ;-)
|
||||
eit_t *eit;
|
||||
struct eit_loop_struct1 *eitloop;
|
||||
struct eit_short_event_descriptor_struct *eitevt;
|
||||
int seclen;
|
||||
unsigned int seclen;
|
||||
unsigned short handle, pid;
|
||||
struct pollfd pfd;
|
||||
eit_event * pevt = (eit_event *)0;
|
||||
time_t tstart;
|
||||
|
||||
@@ -344,9 +339,7 @@ int cEIT::GetEIT()
|
||||
tstart = time(NULL);
|
||||
while ((!evtRunning.bIsValid || !evtNext.bIsValid) && nReceivedEITs < 20 && difftime(time(NULL), tstart) < 4)
|
||||
{
|
||||
pfd.fd=fsvbi;
|
||||
pfd.events=POLLIN;
|
||||
if (poll(&pfd, 1, 5000)==0)
|
||||
if (!cFile::AnyFileReady(fsvbi, 5000))
|
||||
{
|
||||
//cerr << "Timeout\n";
|
||||
CloseFilter(handle);
|
||||
@@ -357,6 +350,8 @@ int cEIT::GetEIT()
|
||||
seclen=(buf[6]<<8)|buf[7];
|
||||
pid=(buf[4]<<8)|buf[5];
|
||||
|
||||
if (seclen >= sizeof(buf))
|
||||
seclen = sizeof(buf) - 1;
|
||||
read(fsvbi, buf, seclen);
|
||||
|
||||
if (seclen < (int)(sizeof(eit_t)
|
||||
|
||||
Reference in New Issue
Block a user