2011-10-03 12:25:04 -07:00
|
|
|
|
/*
|
|
|
|
|
WebServer.cpp
|
|
|
|
|
|
|
|
|
|
Copyright (C) 2003-2007 Ren<EFBFBD> Nyffenegger
|
|
|
|
|
|
|
|
|
|
This source code is provided 'as-is', without any express or implied
|
|
|
|
|
warranty. In no event will the author be held liable for any damages
|
|
|
|
|
arising from the use of this software.
|
|
|
|
|
|
|
|
|
|
Permission is granted to anyone to use this software for any purpose,
|
|
|
|
|
including commercial applications, and to alter it and redistribute it
|
|
|
|
|
freely, subject to the following restrictions:
|
|
|
|
|
|
|
|
|
|
1. The origin of this source code must not be misrepresented; you must not
|
2012-01-30 16:38:18 -08:00
|
|
|
|
claim that you wrote the original source code. If you use this source code
|
|
|
|
|
in a product, an acknowledgment in the product documentation would be
|
|
|
|
|
appreciated but is not required.
|
2011-10-03 12:25:04 -07:00
|
|
|
|
|
|
|
|
|
2. Altered source versions must be plainly marked as such, and must not be
|
2012-01-30 16:38:18 -08:00
|
|
|
|
misrepresented as being the original source code.
|
2011-10-03 12:25:04 -07:00
|
|
|
|
|
|
|
|
|
3. This notice may not be removed or altered from any source distribution.
|
|
|
|
|
|
|
|
|
|
Ren<EFBFBD> Nyffenegger rene.nyffenegger@adp-gmbh.ch
|
|
|
|
|
|
|
|
|
|
Thanks to Tom Lynn who pointed out an error in this source code.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Note on point 2:
|
|
|
|
|
THIS IS NOT THE ORIGINAL SOURCE1!!1!!!~!!~`1ONE!!`1
|
|
|
|
|
*/
|
|
|
|
|
|
2012-01-29 11:28:19 -08:00
|
|
|
|
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
|
|
|
|
|
|
2011-10-03 12:25:04 -07:00
|
|
|
|
#include <ctime>
|
|
|
|
|
#ifdef _WIN32
|
2012-01-29 11:28:19 -08:00
|
|
|
|
#include <process.h>
|
2011-10-03 12:25:04 -07:00
|
|
|
|
#endif
|
|
|
|
|
#include <iostream>
|
|
|
|
|
#include <sstream>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#include "WebServer.h"
|
2012-01-29 11:28:19 -08:00
|
|
|
|
#include "cEvents.h"
|
2011-10-03 12:25:04 -07:00
|
|
|
|
#include "Socket.h"
|
|
|
|
|
#include "UrlHelper.h"
|
|
|
|
|
#include "base64.h"
|
|
|
|
|
|
2012-05-25 00:18:52 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
webserver::request_func webserver::request_func_ = NULL;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-10-03 12:25:04 -07:00
|
|
|
|
|
2012-01-31 12:56:42 -08:00
|
|
|
|
static std::string EatLine( std::string& a_String )
|
|
|
|
|
{
|
|
|
|
|
std::string RetVal = "";
|
|
|
|
|
unsigned int StringSize = a_String.size();
|
|
|
|
|
const char* c = a_String.c_str();
|
|
|
|
|
|
|
|
|
|
for( unsigned int i = 0; i < StringSize; ++i, ++c)
|
|
|
|
|
{
|
|
|
|
|
if( *c == '\n' )
|
|
|
|
|
{
|
|
|
|
|
RetVal += *c;
|
|
|
|
|
// ++i; ++c;
|
|
|
|
|
// if( i < StringSize )
|
|
|
|
|
// {
|
|
|
|
|
// if( *c == '\r' )
|
|
|
|
|
// {
|
|
|
|
|
// RetVal += *c;
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
RetVal += *c;
|
|
|
|
|
}
|
|
|
|
|
a_String = a_String.substr( RetVal.size() );
|
|
|
|
|
return RetVal;
|
|
|
|
|
}
|
|
|
|
|
|
2012-05-25 00:18:52 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2012-01-31 12:56:42 -08:00
|
|
|
|
// Turns
|
|
|
|
|
// "blabla my string with \"quotes\"!"
|
|
|
|
|
// into
|
|
|
|
|
// blabla my string with "quotes"!
|
|
|
|
|
static std::string GetQuotedString( const std::string& a_String )
|
|
|
|
|
{
|
|
|
|
|
std::string RetVal;
|
|
|
|
|
|
|
|
|
|
bool bGotFirstQuote = false;
|
|
|
|
|
bool bIgnoreNext = false;
|
|
|
|
|
unsigned int StrLen = a_String.size();
|
|
|
|
|
for( unsigned int i = 0; i < StrLen; ++i )
|
|
|
|
|
{
|
|
|
|
|
if( bIgnoreNext == false )
|
|
|
|
|
{
|
|
|
|
|
if( a_String[i] == '\"' )
|
|
|
|
|
{
|
|
|
|
|
if( bGotFirstQuote == false )
|
|
|
|
|
{
|
|
|
|
|
bGotFirstQuote = true;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
else if( a_String[i] == '\\' ) // Escape character
|
|
|
|
|
{
|
|
|
|
|
bIgnoreNext = true;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
RetVal.push_back( a_String[i] );
|
|
|
|
|
bIgnoreNext = false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return RetVal;
|
|
|
|
|
}
|
|
|
|
|
|
2012-05-25 00:18:52 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2012-01-31 12:56:42 -08:00
|
|
|
|
void ParseMultipartFormData( webserver::http_request& req, Socket* s)
|
|
|
|
|
{
|
|
|
|
|
static const std::string multipart_form_data = "multipart/form-data";
|
|
|
|
|
if(req.content_type_.substr(0, multipart_form_data.size()) == multipart_form_data) // Difficult data... :(
|
|
|
|
|
{
|
2012-02-01 01:12:54 -08:00
|
|
|
|
AStringVector ContentTypeData = StringSplit( req.content_type_, "; " );
|
2012-01-31 12:56:42 -08:00
|
|
|
|
|
|
|
|
|
std::string boundary;
|
|
|
|
|
// Find boundary
|
|
|
|
|
for( unsigned int i = 0; i < ContentTypeData.size(); ++i )
|
|
|
|
|
{
|
|
|
|
|
static const std::string boundary_ = "boundary=";
|
|
|
|
|
if( ContentTypeData[i].substr(0, boundary_.size()) == boundary_ ) // Found boundary
|
|
|
|
|
{
|
|
|
|
|
boundary = ContentTypeData[i].substr( boundary_.size() );
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//LOGINFO("Boundary: %s", boundary.c_str() );
|
|
|
|
|
std::string boundary_start = "--" + boundary;
|
|
|
|
|
std::string boundary_end = boundary_start + "--";
|
|
|
|
|
|
|
|
|
|
std::string Content = s->ReceiveBytes( req.content_length_ );
|
|
|
|
|
|
|
|
|
|
//printf("Total content: \n%s\n", Content.c_str() );
|
|
|
|
|
|
|
|
|
|
// Should start with boundary!
|
|
|
|
|
std::string line = EatLine( Content );
|
|
|
|
|
if( line.substr(0, boundary_start.size() ) != boundary_start )
|
|
|
|
|
{
|
|
|
|
|
// Something was wrong! :(
|
|
|
|
|
Content.clear();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
while( !Content.empty() )
|
|
|
|
|
{
|
|
|
|
|
webserver::formdata FormData;
|
|
|
|
|
|
|
|
|
|
static const std::string content_disposition = "Content-Disposition: ";
|
|
|
|
|
static const std::string content_type = "Content-Type: ";
|
|
|
|
|
|
|
|
|
|
std::string f_disposition;
|
|
|
|
|
|
|
|
|
|
while( 1 )
|
|
|
|
|
{
|
|
|
|
|
std::string line = EatLine( Content );
|
|
|
|
|
if( line.empty() )
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
unsigned int pos_cr_lf = line.find_first_of("\x0a\x0d");
|
|
|
|
|
if (pos_cr_lf == 0) break; // Empty line, indicates end of mime thingy
|
|
|
|
|
|
|
|
|
|
if( line.substr(0, content_disposition.size() ) == content_disposition )
|
|
|
|
|
{
|
|
|
|
|
f_disposition = line.substr(content_disposition.size());
|
|
|
|
|
LOGINFO("Disposition: %s", f_disposition.c_str() );
|
|
|
|
|
}
|
|
|
|
|
else if( line.substr(0, content_type.size() ) == content_type )
|
|
|
|
|
{
|
|
|
|
|
FormData.content_type_ = line.substr(content_type.size());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//LOGINFO("Got line: '%s'", line.c_str() );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Check if we got the proper headers
|
|
|
|
|
if( !f_disposition.empty() )
|
|
|
|
|
{
|
|
|
|
|
static const std::string disp_name = "name=";
|
|
|
|
|
static const std::string disp_filename = "filename=";
|
|
|
|
|
|
|
|
|
|
// Parse the disposition
|
2012-02-01 01:12:54 -08:00
|
|
|
|
AStringVector DispositionData = StringSplit( f_disposition, "; " );
|
2012-01-31 12:56:42 -08:00
|
|
|
|
for( unsigned int i = 0; i < DispositionData.size(); ++i )
|
|
|
|
|
{
|
|
|
|
|
if( DispositionData[i].substr(0, disp_name.size()) == disp_name )
|
|
|
|
|
{
|
|
|
|
|
FormData.name_ = GetQuotedString( DispositionData[i].substr(disp_name.size()) );
|
|
|
|
|
}
|
|
|
|
|
else if( DispositionData[i].substr(0, disp_filename.size()) == disp_filename )
|
|
|
|
|
{
|
|
|
|
|
FormData.filename_ = GetQuotedString( DispositionData[i].substr(disp_filename.size()) );
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
std::string ContentValue;
|
|
|
|
|
// Parse until boundary_end is found
|
|
|
|
|
while( 1 )
|
|
|
|
|
{
|
|
|
|
|
std::string line = EatLine( Content );
|
|
|
|
|
if( line.empty() )
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
if( line.substr(0, boundary_end.size() ) == boundary_end )
|
|
|
|
|
{
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
else if( line.substr(0, boundary_start.size() ) == boundary_start )
|
|
|
|
|
{
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
ContentValue.append( line.c_str(), line.size() );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
FormData.value_ = ContentValue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
req.multipart_formdata_.push_back( FormData );
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2012-05-25 00:18:52 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-10-03 12:25:04 -07:00
|
|
|
|
#ifdef _WIN32
|
|
|
|
|
unsigned webserver::Request(void* ptr_s)
|
|
|
|
|
#else
|
|
|
|
|
void* webserver::Request(void* ptr_s)
|
|
|
|
|
#endif
|
|
|
|
|
{
|
2012-01-30 16:38:18 -08:00
|
|
|
|
Socket* s = (reinterpret_cast<Socket*>(ptr_s));
|
2011-10-03 12:25:04 -07:00
|
|
|
|
|
2012-01-30 16:38:18 -08:00
|
|
|
|
std::string line = s->ReceiveLine();
|
|
|
|
|
if (line.empty())
|
|
|
|
|
{
|
|
|
|
|
s->Close();
|
|
|
|
|
delete s;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2011-10-03 12:25:04 -07:00
|
|
|
|
|
2012-01-30 16:38:18 -08:00
|
|
|
|
http_request req;
|
|
|
|
|
std::string path;
|
|
|
|
|
std::map<std::string, std::string> params;
|
|
|
|
|
size_t posStartPath = 0;
|
2011-10-03 12:25:04 -07:00
|
|
|
|
|
2012-01-30 16:38:18 -08:00
|
|
|
|
if (line.find("GET") == 0)
|
|
|
|
|
{
|
|
|
|
|
req.method_="GET";
|
|
|
|
|
posStartPath = line.find_first_not_of(" ",3);
|
|
|
|
|
}
|
|
|
|
|
else if (line.find("POST") == 0)
|
|
|
|
|
{
|
|
|
|
|
req.method_="POST";
|
|
|
|
|
posStartPath = line.find_first_not_of(" ",4);
|
|
|
|
|
}
|
2011-10-03 12:25:04 -07:00
|
|
|
|
|
2012-01-30 16:38:18 -08:00
|
|
|
|
SplitGetReq(line.substr(posStartPath), path, params);
|
2011-10-03 12:25:04 -07:00
|
|
|
|
|
2012-01-30 16:38:18 -08:00
|
|
|
|
req.status_ = "202 OK";
|
|
|
|
|
req.s_ = s;
|
|
|
|
|
req.path_ = path;
|
|
|
|
|
req.params_ = params;
|
2011-10-03 12:25:04 -07:00
|
|
|
|
|
2012-01-30 16:38:18 -08:00
|
|
|
|
static const std::string authorization = "Authorization: Basic ";
|
|
|
|
|
static const std::string accept = "Accept: " ;
|
|
|
|
|
static const std::string accept_language = "Accept-Language: " ;
|
|
|
|
|
static const std::string accept_encoding = "Accept-Encoding: " ;
|
|
|
|
|
static const std::string user_agent = "User-Agent: " ;
|
|
|
|
|
static const std::string content_length = "Content-Length: " ;
|
|
|
|
|
static const std::string content_type = "Content-Type: " ;
|
2011-10-03 12:25:04 -07:00
|
|
|
|
|
2012-01-30 16:38:18 -08:00
|
|
|
|
while(1)
|
|
|
|
|
{
|
|
|
|
|
line=s->ReceiveLine();
|
2012-01-31 12:56:42 -08:00
|
|
|
|
if (line.empty())
|
|
|
|
|
{
|
|
|
|
|
break;
|
|
|
|
|
}
|
2011-10-03 12:25:04 -07:00
|
|
|
|
|
2012-01-30 16:38:18 -08:00
|
|
|
|
unsigned int pos_cr_lf = line.find_first_of("\x0a\x0d");
|
|
|
|
|
if (pos_cr_lf == 0) break;
|
2011-10-03 12:25:04 -07:00
|
|
|
|
|
2012-01-30 16:38:18 -08:00
|
|
|
|
line = line.substr(0,pos_cr_lf);
|
2011-10-03 12:25:04 -07:00
|
|
|
|
|
2012-01-30 16:38:18 -08:00
|
|
|
|
if (line.substr(0, authorization.size()) == authorization)
|
|
|
|
|
{
|
|
|
|
|
req.authentication_given_ = true;
|
|
|
|
|
std::string encoded = line.substr(authorization.size());
|
|
|
|
|
std::string decoded = base64_decode(encoded);
|
2011-10-03 12:25:04 -07:00
|
|
|
|
|
2012-01-30 16:38:18 -08:00
|
|
|
|
unsigned int pos_colon = decoded.find(":");
|
2011-10-03 12:25:04 -07:00
|
|
|
|
|
2012-01-30 16:38:18 -08:00
|
|
|
|
req.username_ = decoded.substr(0, pos_colon);
|
|
|
|
|
req.password_ = decoded.substr(pos_colon+1 );
|
|
|
|
|
}
|
|
|
|
|
else if (line.substr(0, accept.size()) == accept)
|
|
|
|
|
{
|
|
|
|
|
req.accept_ = line.substr(accept.size());
|
|
|
|
|
}
|
|
|
|
|
else if (line.substr(0, accept_language.size()) == accept_language)
|
|
|
|
|
{
|
|
|
|
|
req.accept_language_ = line.substr(accept_language.size());
|
|
|
|
|
}
|
|
|
|
|
else if (line.substr(0, accept_encoding.size()) == accept_encoding)
|
|
|
|
|
{
|
|
|
|
|
req.accept_encoding_ = line.substr(accept_encoding.size());
|
|
|
|
|
}
|
|
|
|
|
else if (line.substr(0, user_agent.size()) == user_agent)
|
|
|
|
|
{
|
|
|
|
|
req.user_agent_ = line.substr(user_agent.size());
|
|
|
|
|
}
|
|
|
|
|
else if (line.substr(0, content_length.size()) == content_length)
|
|
|
|
|
{
|
|
|
|
|
req.content_length_ = atoi( line.substr(content_length.size()).c_str() );
|
|
|
|
|
}
|
|
|
|
|
else if (line.substr(0, content_type.size()) == content_type)
|
|
|
|
|
{
|
|
|
|
|
req.content_type_ = line.substr(content_type.size());
|
|
|
|
|
}
|
|
|
|
|
}
|
2011-10-03 12:25:04 -07:00
|
|
|
|
|
2012-01-31 12:56:42 -08:00
|
|
|
|
if( (req.method_.compare("POST") == 0) && (req.content_length_ > 0) )
|
2012-01-30 16:38:18 -08:00
|
|
|
|
{
|
2012-01-31 12:56:42 -08:00
|
|
|
|
// The only content type we can parse at the moment, the default HTML post data
|
|
|
|
|
if( req.content_type_.compare( "application/x-www-form-urlencoded" ) == 0 )
|
2012-01-30 16:38:18 -08:00
|
|
|
|
{
|
2012-01-31 12:56:42 -08:00
|
|
|
|
std::string Content = s->ReceiveBytes( req.content_length_ );
|
|
|
|
|
Content.insert( 0, "/ ?" ); // Little hack, inserts dummy URL so that SplitGetReq() can work with this content
|
2011-10-03 12:25:04 -07:00
|
|
|
|
|
2012-01-31 12:56:42 -08:00
|
|
|
|
std::string dummy;
|
|
|
|
|
std::map<std::string, std::string> post_params;
|
|
|
|
|
SplitGetReq(Content, dummy, post_params);
|
2011-10-03 12:25:04 -07:00
|
|
|
|
|
2012-01-31 12:56:42 -08:00
|
|
|
|
req.params_post_ = post_params;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
ParseMultipartFormData( req, s );
|
2012-01-30 16:38:18 -08:00
|
|
|
|
}
|
|
|
|
|
}
|
2011-10-03 12:25:04 -07:00
|
|
|
|
|
2012-01-30 16:38:18 -08:00
|
|
|
|
request_func_(&req);
|
2011-10-03 12:25:04 -07:00
|
|
|
|
|
2012-01-30 16:38:18 -08:00
|
|
|
|
std::stringstream str_str;
|
|
|
|
|
str_str << req.answer_.size();
|
2011-10-03 12:25:04 -07:00
|
|
|
|
|
2012-01-30 16:38:18 -08:00
|
|
|
|
time_t ltime;
|
|
|
|
|
time(<ime);
|
|
|
|
|
tm* gmt= gmtime(<ime);
|
2011-10-03 12:25:04 -07:00
|
|
|
|
|
|
|
|
|
#ifdef _WIN32
|
2012-01-30 16:38:18 -08:00
|
|
|
|
static std::string const serverName = "MCServerWebAdmin (Windows)";
|
2011-10-03 12:25:04 -07:00
|
|
|
|
#elif __APPLE__
|
2012-01-30 16:38:18 -08:00
|
|
|
|
static std::string const serverName = "MCServerWebAdmin (MacOSX)";
|
2011-10-03 12:25:04 -07:00
|
|
|
|
#else
|
2012-01-30 16:38:18 -08:00
|
|
|
|
static std::string const serverName = "MCServerWebAdmin (Linux)";
|
2011-10-03 12:25:04 -07:00
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
2012-01-30 16:38:18 -08:00
|
|
|
|
char* asctime_remove_nl = std::asctime(gmt);
|
|
|
|
|
asctime_remove_nl[24] = 0;
|
2011-10-03 12:25:04 -07:00
|
|
|
|
|
2012-01-30 16:38:18 -08:00
|
|
|
|
s->SendBytes("HTTP/1.1 ");
|
2011-10-03 12:25:04 -07:00
|
|
|
|
|
2012-01-30 16:38:18 -08:00
|
|
|
|
if (! req.auth_realm_.empty() )
|
|
|
|
|
{
|
|
|
|
|
s->SendLine("401 Unauthorized");
|
|
|
|
|
s->SendBytes("WWW-Authenticate: Basic Realm=\"");
|
|
|
|
|
s->SendBytes(req.auth_realm_);
|
|
|
|
|
s->SendLine("\"");
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
s->SendLine(req.status_);
|
|
|
|
|
}
|
|
|
|
|
s->SendLine(std::string("Date: ") + asctime_remove_nl + " GMT");
|
|
|
|
|
s->SendLine(std::string("Server: ") +serverName);
|
|
|
|
|
s->SendLine("Connection: close");
|
|
|
|
|
s->SendLine("Content-Type: text/html; charset=ISO-8859-1");
|
|
|
|
|
s->SendLine("Content-Length: " + str_str.str());
|
|
|
|
|
s->SendLine("");
|
|
|
|
|
s->SendLine(req.answer_);
|
|
|
|
|
|
|
|
|
|
s->Close( true ); // true = wait for all data to be sent before closing
|
|
|
|
|
delete s;
|
2011-10-03 12:25:04 -07:00
|
|
|
|
|
|
|
|
|
|
2012-01-30 16:38:18 -08:00
|
|
|
|
return 0;
|
2011-10-03 12:25:04 -07:00
|
|
|
|
}
|
|
|
|
|
|
2012-05-25 00:18:52 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-10-03 12:25:04 -07:00
|
|
|
|
void webserver::Stop()
|
|
|
|
|
{
|
|
|
|
|
m_bStop = true;
|
|
|
|
|
m_Socket->Close();
|
2012-01-29 11:28:19 -08:00
|
|
|
|
m_Events->Wait();
|
2011-10-03 12:25:04 -07:00
|
|
|
|
}
|
|
|
|
|
|
2012-05-25 00:18:52 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
bool webserver::Begin()
|
2011-10-03 12:25:04 -07:00
|
|
|
|
{
|
2012-05-25 00:18:52 -07:00
|
|
|
|
if (!m_Socket->IsValid())
|
|
|
|
|
{
|
|
|
|
|
LOGINFO("WebAdmin: The server socket is invalid. Terminating WebAdmin.");
|
|
|
|
|
return false;
|
|
|
|
|
}
|
2011-10-03 12:25:04 -07:00
|
|
|
|
m_bStop = false;
|
|
|
|
|
while ( !m_bStop )
|
|
|
|
|
{
|
2012-05-25 00:18:52 -07:00
|
|
|
|
Socket * ptr_s = m_Socket->Accept();
|
|
|
|
|
if (m_bStop)
|
2011-10-03 12:25:04 -07:00
|
|
|
|
{
|
2012-05-25 00:18:52 -07:00
|
|
|
|
if (ptr_s != 0)
|
2011-10-03 12:25:04 -07:00
|
|
|
|
{
|
|
|
|
|
ptr_s->Close();
|
|
|
|
|
delete ptr_s;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
2012-05-25 00:18:52 -07:00
|
|
|
|
if (ptr_s == NULL)
|
|
|
|
|
{
|
|
|
|
|
LOGINFO("WebAdmin: Accepted socket is NULL. Terminating WebAdmin to avoid busywait.");
|
|
|
|
|
return false;
|
|
|
|
|
}
|
2011-10-03 12:25:04 -07:00
|
|
|
|
|
|
|
|
|
#ifdef _WIN32
|
|
|
|
|
unsigned ret;
|
2012-05-25 00:18:52 -07:00
|
|
|
|
HANDLE hHandle = reinterpret_cast<HANDLE>(_beginthreadex(NULL, 0, Request, (void *)ptr_s, 0, &ret));
|
2011-10-03 12:25:04 -07:00
|
|
|
|
CloseHandle(hHandle);
|
|
|
|
|
#else
|
2012-05-25 00:18:52 -07:00
|
|
|
|
// Mattes: TODO: this handle probably leaks!
|
|
|
|
|
pthread_t * hHandle = new pthread_t;
|
2011-10-03 12:25:04 -07:00
|
|
|
|
pthread_create( hHandle, NULL, Request, ptr_s);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
2012-01-29 11:28:19 -08:00
|
|
|
|
m_Events->Set();
|
2012-05-25 00:18:52 -07:00
|
|
|
|
return true;
|
2011-10-03 12:25:04 -07:00
|
|
|
|
}
|
|
|
|
|
|
2012-05-25 00:18:52 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
webserver::webserver(unsigned int port_to_listen, request_func r)
|
|
|
|
|
{
|
|
|
|
|
m_Socket = new SocketServer(port_to_listen, 1);
|
2011-10-03 12:25:04 -07:00
|
|
|
|
|
|
|
|
|
request_func_ = r;
|
2012-01-29 11:28:19 -08:00
|
|
|
|
m_Events = new cEvents();
|
2011-10-03 12:25:04 -07:00
|
|
|
|
}
|
|
|
|
|
|
2012-05-25 00:18:52 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-10-03 12:25:04 -07:00
|
|
|
|
webserver::~webserver()
|
|
|
|
|
{
|
|
|
|
|
delete m_Socket;
|
2012-01-29 11:28:19 -08:00
|
|
|
|
delete m_Events;
|
2011-10-03 12:25:04 -07:00
|
|
|
|
}
|
2012-05-25 00:18:52 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|