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

Fixed invalid DTSC packets causing progressive processes to block indefinitely.

Browse source
This commit is contained in:
Thulinma 2013-09-20 11:15:08 +02:00
parent 6e9f797847
commit 391f3cf174
4 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/connectors/conn_http_progressive_flv.cpp
View file

@ -163,6 +163,12 @@ namespace Connector_HTTP {
if (Strm.lastType() == DTSC::PAUSEMARK){ if (Strm.lastType() == DTSC::PAUSEMARK){
conn.close(); conn.close();
} }
if (Strm.lastType() == DTSC::INVALID){
#if DEBUG >= 3
fprintf(stderr, "Invalid packet received - closing connection.\n");
#endif
conn.close();
}
if (Strm.lastType() == DTSC::AUDIO || Strm.lastType() == DTSC::VIDEO){ if (Strm.lastType() == DTSC::AUDIO || Strm.lastType() == DTSC::VIDEO){
std::string codec = Strm.getTrackById(Strm.getPacket()["trackid"].asInt())["codec"].asString(); std::string codec = Strm.getTrackById(Strm.getPacket()["trackid"].asInt())["codec"].asString();
if (codec == "AAC" || codec == "MP3" || codec == "H264"){ if (codec == "AAC" || codec == "MP3" || codec == "H264"){

10
src/connectors/conn_http_progressive_mp3.cpp
View file

@ -132,10 +132,16 @@ namespace Connector_HTTP {
conn.SendNow(HTTP_S.BuildResponse("200", "OK")); //no SetBody = unknown length - this is intentional, we will stream the entire file conn.SendNow(HTTP_S.BuildResponse("200", "OK")); //no SetBody = unknown length - this is intentional, we will stream the entire file
progressive_has_sent_header = true; progressive_has_sent_header = true;
} }
if(Strm.lastType() == DTSC::PAUSEMARK){ if (Strm.lastType() == DTSC::PAUSEMARK){
conn.close(); conn.close();
} }
if(Strm.lastType() == DTSC::AUDIO){ if (Strm.lastType() == DTSC::INVALID){
#if DEBUG >= 3
fprintf(stderr, "Invalid packet received - closing connection.\n");
#endif
conn.close();
}
if (Strm.lastType() == DTSC::AUDIO){
conn.SendNow(Strm.lastData()); //write the MP3 contents conn.SendNow(Strm.lastData()); //write the MP3 contents
} }
} }

6
src/connectors/conn_http_progressive_mp4.cpp
View file

@ -182,6 +182,12 @@ namespace Connector_HTTP {
//parse DTSC to MP4 here //parse DTSC to MP4 here
conn.SendNow(Strm.lastData());//send out and clear Convverter buffer conn.SendNow(Strm.lastData());//send out and clear Convverter buffer
} }
if (Strm.lastType() == DTSC::INVALID){
#if DEBUG >= 3
fprintf(stderr, "Invalid packet received - closing connection.\n");
#endif
conn.close();
}
} }
}else{ }else{
Util::sleep(1); Util::sleep(1);

7
src/connectors/conn_http_progressive_ogg.cpp
View file

@ -190,7 +190,12 @@ namespace Connector_HTTP {
if (Strm.lastType() == DTSC::PAUSEMARK){ if (Strm.lastType() == DTSC::PAUSEMARK){
conn.close(); conn.close();
//last page output //last page output
}
if (Strm.lastType() == DTSC::INVALID){
#if DEBUG >= 3
fprintf(stderr, "Invalid packet received - closing connection.\n");
#endif
conn.close();
} }
} }
}else{ }else{