ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Send an RTCP RR packet when we get a timeout to see if we are really dead.

This commit is contained in:
Isaac Connor 2015-01-28 12:36:11 -05:00
parent 56c82cfbb5
commit b97f2fa4f6
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/zm_rtp_ctrl.cpp
View File

@ -302,6 +302,9 @@ int RtpCtrlThread::run()
select.addReader( &rtpCtrlServer ); select.addReader( &rtpCtrlServer );
unsigned char buffer[ZM_NETWORK_BUFSIZ]; unsigned char buffer[ZM_NETWORK_BUFSIZ];
bool timeout = false; // used as a flag that we had a timeout, and then sent an RR to see if we wake back up. Real timeout will happen when this is true.
while ( !mStop && select.wait() >= 0 ) while ( !mStop && select.wait() >= 0 )
{ {
if ( mStop ) if ( mStop )
@ -309,8 +312,21 @@ int RtpCtrlThread::run()
Select::CommsList readable = select.getReadable(); Select::CommsList readable = select.getReadable();
if ( readable.size() == 0 ) if ( readable.size() == 0 )
{ {
Error( "RTCP timed out" ); if ( ! timeout ) {
break; ssize_t nBytes;
unsigned char *bufferPtr = buffer;
bufferPtr += generateRr( bufferPtr, sizeof(buffer)-(bufferPtr-buffer) );
bufferPtr += generateSdes( bufferPtr, sizeof(buffer)-(bufferPtr-buffer) );
Debug( 4, "Sending %zd bytes on sd %d", bufferPtr-buffer, rtpCtrlServer.getWriteDesc() );
Debug( 5, "Sending %s", buffer );
if ( (nBytes = rtpCtrlServer.send( buffer, bufferPtr-buffer )) < 0 )
Error( "Unable to send: %s", strerror( errno ) );
timeout = true;
continue;
} else {
Error( "RTCP timed out" );
break;
}
} }
for ( Select::CommsList::iterator iter = readable.begin(); iter != readable.end(); iter++ ) for ( Select::CommsList::iterator iter = readable.begin(); iter != readable.end(); iter++ )
{ {