Server must close the VTP connection also if filter stream is broken

Otherwise, if a client which is not livestreaming (e.g. watching a recording)
doesn't properly shutdown the port 2004 connection, the filter stream remains
open until TCP keepalive takes care of it. In the meantime, the log will show
ringbuffer overflows.
This commit is contained in:
Frank Schmirler 2011-06-03 13:24:12 +02:00
parent f6299b4584
commit f73665a0bd
2 changed files with 4 additions and 2 deletions

View File

@ -1,6 +1,7 @@
VDR Plugin 'streamdev' Revision History VDR Plugin 'streamdev' Revision History
--------------------------------------- ---------------------------------------
- server must close the VTP connection also if filter stream is broken
- fixed missing #ifdefs for new NumProvidedSystems setup option - fixed missing #ifdefs for new NumProvidedSystems setup option
- new externremux.sh mencoder config options: audio pid by language code - new externremux.sh mencoder config options: audio pid by language code
(-alang) and verbosity (-msglevel) (thanks to Pekko Tiitto) (-alang) and verbosity (-msglevel) (thanks to Pekko Tiitto)

View File

@ -772,9 +772,10 @@ cConnectionVTP::~cConnectionVTP()
delete m_RecPlayer; delete m_RecPlayer;
} }
inline bool cConnectionVTP::Abort(void) const bool cConnectionVTP::Abort(void) const
{ {
return m_LiveStreamer && m_LiveStreamer->Abort(); return (m_LiveStreamer && m_LiveStreamer->Abort()) ||
(m_FilterStreamer && m_FilterStreamer->Abort());
} }
void cConnectionVTP::Welcome(void) void cConnectionVTP::Welcome(void)