hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added timeout to DTSC::Stream::waitForMeta() function

Browse source
This commit is contained in:
Thulinma 2014-01-13 11:22:50 +01:00
parent fccacc5c96
commit d11050db34
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/dtsc.cpp
View file

@ -180,18 +180,21 @@ void DTSC::Stream::endStream(){
/// Blocks until either the stream has metadata available or the sourceSocket errors. /// Blocks until either the stream has metadata available or the sourceSocket errors.
/// This function is intended to be run before any commands are sent and thus will not throw away anything important. /// This function is intended to be run before any commands are sent and thus will not throw away anything important.
/// It will time out after 5 seconds, disconnecting the sourceSocket.
void DTSC::Stream::waitForMeta(Socket::Connection & sourceSocket){ void DTSC::Stream::waitForMeta(Socket::Connection & sourceSocket){
while ( !metadata && sourceSocket.connected()){ //cancel the attempt after 5000 milliseconds
long long int start = Util::getMS();
while ( !metadata && sourceSocket.connected() && Util::getMS() - start < 5000){
//we have data? attempt to read header //we have data? attempt to read header
if (sourceSocket.Received().size()){ if (sourceSocket.Received().size()){
//return value is ignore because we're not interested in data packets, just metadata. //return value is ignored because we're not interested in data packets, just metadata.
parsePacket(sourceSocket.Received()); parsePacket(sourceSocket.Received());
} }
//still no header? check for more data //still no header? check for more data
if ( !metadata){ if ( !metadata){
if (sourceSocket.spool()){ if (sourceSocket.spool()){
//more received? attempt to read //more received? attempt to read
//return value is ignore because we're not interested in data packets, just metadata. //return value is ignored because we're not interested in data packets, just metadata.
parsePacket(sourceSocket.Received()); parsePacket(sourceSocket.Received());
}else{ }else{
//nothing extra to receive? wait a bit and retry //nothing extra to receive? wait a bit and retry
@ -199,6 +202,14 @@ void DTSC::Stream::waitForMeta(Socket::Connection & sourceSocket){
} }
} }
} }
//if the timeout has passed, close the socket
if (Util::getMS() - start >= 5000){
sourceSocket.close();
//and optionally print a debug message that this happened
#if DEBUG >= 4
fprintf(stderr, "Timed out while waiting for metadata\n");
#endif
}
} }
/// Resets the stream by clearing the buffers and keyframes, making sure to call the deletionCallback first. /// Resets the stream by clearing the buffers and keyframes, making sure to call the deletionCallback first.