frodovdr/vdr-plugin-streamdev
1
0
Fork 0
mirror of https://projects.vdr-developer.org/git/vdr-plugin-streamdev.git synced 2023-10-10 19:16:51 +02:00
Code Issues Releases Wiki Activity

Fixed segfaults due to cTSBuffer disconnect detection workarounds (#260)

Browse Source
This commit is contained in:
schmirl 2007-05-07 12:18:18 +00:00
parent 7fdf0c6832
commit d93eec41f3
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
client/device.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: device.c,v 1.12 2007/04/24 11:24:38 schmirl Exp $ * $Id: device.c,v 1.13 2007/05/07 12:18:18 schmirl Exp $
*/ */
#include "client/device.h" #include "client/device.h"
@ -222,6 +222,10 @@ bool cStreamdevDevice::GetTSPacket(uchar *&Data) {
// simple disconnect detection // simple disconnect detection
static int m_TSFails = 0; static int m_TSFails = 0;
if (!Data) { if (!Data) {
LOCK_THREAD;
if(!ClientSocket.DataSocket(siLive)) {
return false; // triggers CloseDvr() + OpenDvr() in cDevice
}
cPoller Poller(*ClientSocket.DataSocket(siLive)); cPoller Poller(*ClientSocket.DataSocket(siLive));
errno = 0; errno = 0;
if (Poller.Poll() && !errno) { if (Poller.Poll() && !errno) {
@ -278,11 +282,17 @@ bool cStreamdevDevice::Init(void) {
} }
bool cStreamdevDevice::ReInit(void) { bool cStreamdevDevice::ReInit(void) {
if(m_Device) {
m_Device->Lock();
m_Device->m_Filters->SetConnection(-1);
m_Device->m_Pids = 0;
}
ClientSocket.Quit(); ClientSocket.Quit();
ClientSocket.Reset(); ClientSocket.Reset();
if (m_Device != NULL) { if (m_Device != NULL) {
DELETENULL(m_Device->m_TSBuffer); //DELETENULL(m_Device->m_TSBuffer);
DELETENULL(m_Device->m_Assembler); DELETENULL(m_Device->m_Assembler);
m_Device->Unlock();
} }
return StreamdevClientSetup.StartClient ? Init() : true; return StreamdevClientSetup.StartClient ? Init() : true;
} }