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

Random edits

Browse source
This commit is contained in:
Thulinma 2011-03-21 01:03:30 +01:00
parent 4de7da172d
commit 67e5816cb2
1 changed files with 55 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Connector_HTTP/main.cpp
View file

@ -155,8 +155,6 @@ int mainHandler(int CONN_fd){
while (!socketError && !All_Hell_Broke_Loose){ while (!socketError && !All_Hell_Broke_Loose){
//only parse input if available or not yet init'ed //only parse input if available or not yet init'ed
retval = epoll_wait(poller, events, 1, 1);
if ((retval > 0) || !ready4data){
if (HTTP_R.ReadSocket(CONN_fd)){ if (HTTP_R.ReadSocket(CONN_fd)){
handler = HANDLER_PROGRESSIVE; handler = HANDLER_PROGRESSIVE;
if ((HTTP_R.url.find("Seg") != std::string::npos) && (HTTP_R.url.find("Frag") != std::string::npos)){handler = HANDLER_FLASH;} if ((HTTP_R.url.find("Seg") != std::string::npos) && (HTTP_R.url.find("Frag") != std::string::npos)){handler = HANDLER_FLASH;}
@ -182,14 +180,6 @@ int mainHandler(int CONN_fd){
temp = HTTP_R.url.find("Frag") + 4; temp = HTTP_R.url.find("Frag") + 4;
ReqFragment = atoi( HTTP_R.url.substr(temp).c_str() ); ReqFragment = atoi( HTTP_R.url.substr(temp).c_str() );
#if DEBUG >= 4 #if DEBUG >= 4
/* strftime example */
time_t rawtime;
struct tm * timeinfo;
char timebuffer [80];
time ( &rawtime );
timeinfo = localtime ( &rawtime );
strftime (timebuffer,80,"%H:%M.%S.",timeinfo);
fprintf(stderr, "< %s >\t", timebuffer );
printf( "URL: %s\n", HTTP_R.url.c_str()); printf( "URL: %s\n", HTTP_R.url.c_str());
printf( "Movie: %s, Quality: %s, Seg %d Frag %d\n", Movie.c_str(), Quality.c_str(), Segment, ReqFragment); printf( "Movie: %s, Quality: %s, Seg %d Frag %d\n", Movie.c_str(), Quality.c_str(), Segment, ReqFragment);
#endif #endif
@ -222,7 +212,6 @@ int mainHandler(int CONN_fd){
}//PROGRESSIVE handler }//PROGRESSIVE handler
HTTP_R.CleanForNext(); //maak schoon na verwerken voor eventuele volgende requests... HTTP_R.CleanForNext(); //maak schoon na verwerken voor eventuele volgende requests...
} }
}
if (ready4data){ if (ready4data){
if (!inited){ if (!inited){
//we are ready, connect the socket! //we are ready, connect the socket!