Menu
▾
▴
SF.net SVN: bzflag: [15813] trunk/bzflag/plugins
|
From: <br...@us...> - 2007-09-08 00:55:21
|
Revision: 15813
http://bzflag.svn.sourceforge.net/bzflag/?rev=15813&view=rev
Author: brlcad
Date: 2007-09-07 17:55:23 -0700 (Fri, 07 Sep 2007)
Log Message:
-----------
remove more carriage returns
Modified Paths:
--------------
trunk/bzflag/plugins/httpTest/httpTest.cpp
trunk/bzflag/plugins/plugin_utils/plugin_HTTP.cpp
trunk/bzflag/plugins/plugin_utils/plugin_HTTP.h
trunk/bzflag/plugins/plugin_utils/plugin_files.cpp
trunk/bzflag/plugins/webstats/webstats.cpp
Modified: trunk/bzflag/plugins/httpTest/httpTest.cpp
===================================================================
--- trunk/bzflag/plugins/httpTest/httpTest.cpp 2007-09-08 00:54:01 UTC (rev 15812)
+++ trunk/bzflag/plugins/httpTest/httpTest.cpp 2007-09-08 00:55:23 UTC (rev 15813)
@@ -10,17 +10,17 @@
BZ_GET_PLUGIN_VERSION
class HTTPServer : public BZFSHTTPServer
-{
-public:
- HTTPServer( const char * plugInName ): BZFSHTTPServer(plugInName){};
-
- virtual bool acceptURL ( const char *url );
- virtual void getURLData ( const char* url, int requestID, const URLParams ¶maters, bool get = true );
-
- virtual void generateDirpage ( const std::string& url, int requestID );
-
- std::string dir;
- bool dirBrowsing;
+{
+public:
+ HTTPServer( const char * plugInName ): BZFSHTTPServer(plugInName){};
+
+ virtual bool acceptURL ( const char *url );
+ virtual void getURLData ( const char* url, int requestID, const URLParams ¶maters, bool get = true );
+
+ virtual void generateDirpage ( const std::string& url, int requestID );
+
+ std::string dir;
+ bool dirBrowsing;
};
HTTPServer httpServer("httpTest");
@@ -40,140 +40,140 @@
return 0;
}
-bool HTTPServer::acceptURL ( const char *url )
-{
- if (bz_BZDBItemExists("HTTPTestDir"))
- dir = bz_getBZDBString("HTTPTestDir").c_str();
- else
- dir = "./";
- return true;
-}
-
-std::string convertPathToURL ( const std::string &file ) // ensures all the delims are constant
-{
- std::string delim;
- delim += "/";
- return replace_all(file,"\\",delim);
+bool HTTPServer::acceptURL ( const char *url )
+{
+ if (bz_BZDBItemExists("HTTPTestDir"))
+ dir = bz_getBZDBString("HTTPTestDir").c_str();
+ else
+ dir = "./";
+ return true;
}
-
-
-void HTTPServer::generateDirpage ( const std::string &url, int requestID )
-{
- std::string pathURL = url;
- if ( pathURL.size() )
- pathURL = url.c_str()+1;
-
- if (pathURL.size() && *(pathURL.end()-1) == '/')
- pathURL.erase(pathURL.end()-1);
-
- std::string requestedDir = dir + pathURL;
- std::vector<std::string> dirs = getDirsInDir(requestedDir);
-
- std::string page;
- page = "<HTML><HEAD></HEAD><BODY>\n<BR> The URL was " + url + "<BR>\n";
-
- page = "BZFS HTML Test, dir browsing<BR>\n";
-
- std::string serverAddress = getBaseServerURL();
- serverAddress.erase(serverAddress.end()-1);
-
- std::string baseURL;
- if ( url.size() > 1)
- baseURL = url.c_str()+1;
-
- for (int i = 0; i < (int)dirs.size(); i++ )
- {
- std::string returnedDir = dirs[i];
- std::string dirURL = convertPathToURL(returnedDir.c_str()).c_str()+requestedDir.size()+1;
-
- std::string fullURL;
- fullURL += baseURL + dirURL;
- page += format("<A href=\"%s/\">%s/</a><BR>\n",fullURL.c_str(),dirURL.c_str());
- }
-
- std::vector<std::string> files = getFilesInDir(requestedDir);
- for (int i = 0; i < (int)files.size(); i++ )
- {
- std::string fileURL = convertPathToURL(files[i].c_str()).c_str()+dir.size();
- std::string fullURL;
- fullURL += baseURL + fileURL;
- page += format("<A href=\"%s\">%s</a><BR>\n",fullURL.c_str(),fileURL.c_str());
- }
-
- page += "<BR></body></HTML>";
-
- setURLDocType(eHTML,requestID);
- setURLDataSize ( (unsigned int)page.size(), requestID );
- setURLData ( page.c_str(), requestID );
-}
-
-void HTTPServer::getURLData ( const char* url, int requestID, const std::map<std::string,std::string> ¶maters, bool get )
-{
- std::string URL = url;
- if ( !get || tolower(URL) == "status" )
- {
- std::string crapPage = "This Is data from HTTP via BZFS\r\n";
-
- if ( get )
- crapPage += "this was a HTTP GET request\r\n";
- else
- crapPage += "this was an HTTP POST request\r\n";
-
- if (paramaters.size())
- {
- crapPage += "The request had these paramaters\r\n";
-
- URLParams::const_iterator itr = paramaters.begin();
- while ( itr != paramaters.end() )
- {
- crapPage += format("Key = \"%s\" Value = \"%s\"\r\n",itr->first.c_str(),itr->second.c_str());
- itr++;
- }
- }
- else
- crapPage += "The request had no paramaters\r\n";
- crapPage += "\r\n";
- setURLDataSize ( (unsigned int)crapPage.size(), requestID );
- setURLData ( crapPage.c_str(), requestID );
- }
- else
- {
- if (*(URL.end()-1) == '/' || URL.size()< 2)
- {
- if (dirBrowsing)
- {
- generateDirpage(URL,requestID);
- return;
- }
- else
- URL += "index.html";
- }
-
- std::string path = dir + URL;
- FILE *fp = fopen(path.c_str(),"rb");
- if (!fp)
- {
- setURLReturnCode(BZFSHTTPServer::e404NotFound,requestID);
- std::string crapPage = "404: Page Not found (from BZFS)\r\n\r\n";
- setURLDataSize ( (unsigned int)crapPage.size(), requestID );
- setURLData ( crapPage.c_str(), requestID );
- }
- else
- {
- fseek(fp,0,SEEK_END);
- unsigned int size = ftell(fp);
- fseek(fp,0,SEEK_SET);
- char *p = (char*)malloc(size);
- fread(p,size,1,fp);
- setURLDataSize ( size, requestID );
- setURLData ( p, requestID );
- fclose(fp);
- free(p);
- }
- }
-}
+std::string convertPathToURL ( const std::string &file ) // ensures all the delims are constant
+{
+ std::string delim;
+ delim += "/";
+ return replace_all(file,"\\",delim);
+}
+
+void HTTPServer::generateDirpage ( const std::string &url, int requestID )
+{
+ std::string pathURL = url;
+ if ( pathURL.size() )
+ pathURL = url.c_str()+1;
+
+ if (pathURL.size() && *(pathURL.end()-1) == '/')
+ pathURL.erase(pathURL.end()-1);
+
+ std::string requestedDir = dir + pathURL;
+ std::vector<std::string> dirs = getDirsInDir(requestedDir);
+
+ std::string page;
+ page = "<HTML><HEAD></HEAD><BODY>\n<BR> The URL was " + url + "<BR>\n";
+
+ page = "BZFS HTML Test, dir browsing<BR>\n";
+
+ std::string serverAddress = getBaseServerURL();
+ serverAddress.erase(serverAddress.end()-1);
+
+ std::string baseURL;
+ if ( url.size() > 1)
+ baseURL = url.c_str()+1;
+
+ for (int i = 0; i < (int)dirs.size(); i++ )
+ {
+ std::string returnedDir = dirs[i];
+ std::string dirURL = convertPathToURL(returnedDir.c_str()).c_str()+requestedDir.size()+1;
+
+ std::string fullURL;
+ fullURL += baseURL + dirURL;
+ page += format("<A href=\"%s/\">%s/</a><BR>\n",fullURL.c_str(),dirURL.c_str());
+ }
+
+ std::vector<std::string> files = getFilesInDir(requestedDir);
+ for (int i = 0; i < (int)files.size(); i++ )
+ {
+ std::string fileURL = convertPathToURL(files[i].c_str()).c_str()+dir.size();
+ std::string fullURL;
+ fullURL += baseURL + fileURL;
+ page += format("<A href=\"%s\">%s</a><BR>\n",fullURL.c_str(),fileURL.c_str());
+ }
+
+ page += "<BR></body></HTML>";
+
+ setURLDocType(eHTML,requestID);
+ setURLDataSize ( (unsigned int)page.size(), requestID );
+ setURLData ( page.c_str(), requestID );
+}
+
+void HTTPServer::getURLData ( const char* url, int requestID, const std::map<std::string,std::string> ¶maters, bool get )
+{
+ std::string URL = url;
+ if ( !get || tolower(URL) == "status" )
+ {
+ std::string crapPage = "This Is data from HTTP via BZFS\r\n";
+
+ if ( get )
+ crapPage += "this was a HTTP GET request\r\n";
+ else
+ crapPage += "this was an HTTP POST request\r\n";
+
+ if (paramaters.size())
+ {
+ crapPage += "The request had these paramaters\r\n";
+
+ URLParams::const_iterator itr = paramaters.begin();
+ while ( itr != paramaters.end() )
+ {
+ crapPage += format("Key = \"%s\" Value = \"%s\"\r\n",itr->first.c_str(),itr->second.c_str());
+ itr++;
+ }
+ }
+ else
+ crapPage += "The request had no paramaters\r\n";
+ crapPage += "\r\n";
+ setURLDataSize ( (unsigned int)crapPage.size(), requestID );
+ setURLData ( crapPage.c_str(), requestID );
+ }
+ else
+ {
+ if (*(URL.end()-1) == '/' || URL.size()< 2)
+ {
+ if (dirBrowsing)
+ {
+ generateDirpage(URL,requestID);
+ return;
+ }
+ else
+ URL += "index.html";
+ }
+
+ std::string path = dir + URL;
+ FILE *fp = fopen(path.c_str(),"rb");
+ if (!fp)
+ {
+ setURLReturnCode(BZFSHTTPServer::e404NotFound,requestID);
+ std::string crapPage = "404: Page Not found (from BZFS)\r\n\r\n";
+ setURLDataSize ( (unsigned int)crapPage.size(), requestID );
+ setURLData ( crapPage.c_str(), requestID );
+ }
+ else
+ {
+ fseek(fp,0,SEEK_END);
+ unsigned int size = ftell(fp);
+ fseek(fp,0,SEEK_SET);
+ char *p = (char*)malloc(size);
+ fread(p,size,1,fp);
+ setURLDataSize ( size, requestID );
+ setURLData ( p, requestID );
+ fclose(fp);
+ free(p);
+ }
+ }
+}
+
+
// Local Variables: ***
// mode:C++ ***
// tab-width: 8 ***
Modified: trunk/bzflag/plugins/plugin_utils/plugin_HTTP.cpp
===================================================================
--- trunk/bzflag/plugins/plugin_utils/plugin_HTTP.cpp 2007-09-08 00:54:01 UTC (rev 15812)
+++ trunk/bzflag/plugins/plugin_utils/plugin_HTTP.cpp 2007-09-08 00:55:23 UTC (rev 15813)
@@ -1,546 +1,546 @@
-/* bzflag
-* Copyright (c) 1993 - 2007 Tim Riker
-*
-* This package is free software; you can redistribute it and/or
-* modify it under the terms of the license found in the file
-* named COPYING that should have accompanied this file.
-*
-* THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-*/
-
-#include "plugin_HTTP.h"
-#include "plugin_utils.h"
-#include <algorithm>
-
-BZFSHTTPServer::BZFSHTTPServer( const char * plugInName )
-{
- listening = false;
-
- vdir = format("%d/",this);
- std::string clipField;
- std::vector<std::string> dirs;
-
- if (bz_clipFieldExists ( "BZFS_HTTPD_VDIRS" ) && bz_getclipFieldString("BZFS_HTTPD_VDIRS")[0] != 0)
- {
- clipField = bz_getclipFieldString("BZFS_HTTPD_VDIRS");
- dirs = tokenize(clipField,std::string(","),0,false);
-
- if (plugInName && tolower(std::string(plugInName)) != "bzfs")
- {
- if (std::find(dirs.begin(),dirs.end(),std::string(plugInName)) == dirs.end())
- vdir = plugInName;
- }
- }
- else
- {
- if (plugInName && tolower(std::string(plugInName)) != "bzfs")
- vdir = plugInName;
- }
-
- clipField += "," + vdir;
-
- bz_setclipFieldString ( "BZFS_HTTPD_VDIRS", clipField.c_str() );
-
- // see if I am the indexer or not
- if (!bz_clipFieldExists ( "BZFS_HTTPD_INDEXER" ) || bz_getclipFieldString("BZFS_HTTPD_INDEXER")[0] == 0)
- bz_setclipFieldString("BZFS_HTTPD_INDEXER",format("%d",(int)this).c_str());
-}
-
-BZFSHTTPServer::~BZFSHTTPServer()
-{
- shutdownHTTP();
-
- // clear out the
- if (bz_clipFieldExists ( "BZFS_HTTPD_INDEXER" ))
- {
- std::string myThis = format("%d",(int)this);
- if (bz_getclipFieldString("BZFS_HTTPD_INDEXER") == myThis)
- bz_setclipFieldString("BZFS_HTTPD_INDEXER","");
- }
-
- if (bz_clipFieldExists ( "BZFS_HTTPD_VDIRS" ) && bz_getclipFieldString("BZFS_HTTPD_VDIRS")[0] != 0)
- {
- std::string clipField = bz_getclipFieldString("BZFS_HTTPD_VDIRS");
- std::vector<std::string> dirs = tokenize(clipField,std::string(","),0,false);
-
- clipField = "";
- for ( int i = 0; i < (int)dirs.size(); i++ )
- {
- if ( dirs[i] != dirs[i] )
- clipField += vdir + ",";
- }
- bz_setclipFieldString("BZFS_HTTPD_VDIRS",clipField.c_str());
- }
-}
-
-void BZFSHTTPServer::startupHTTP ( void )
-{
- shutdownHTTP();
-
- bz_registerEvent (bz_eTickEvent,this);
- bz_registerEvent (bz_eNewNonPlayerConnection,this);
-
- baseURL = "http://";
- std::string host = "localhost:5154";
- if (bz_getPublicAddr().size())
- host = bz_getPublicAddr().c_str();
-
- // make sure it has the port
- if ( strrchr(host.c_str(),':') == NULL )
- host += format(":%d",bz_getPublicPort());
-
- baseURL += host;
- baseURL += "/" + vdir + "/";
-
- listening = true;
-}
-
-void BZFSHTTPServer::shutdownHTTP ( void )
-{
- if (!listening)
- return;
-
- bz_removeEvent (bz_eTickEvent,this);
- bz_removeEvent (bz_eNewNonPlayerConnection,this);
-
- // kill the users;
- std::map<int,HTTPConnectedUsers*>::iterator itr = users.begin();
- while ( itr != users.end() )
- {
- bz_removeNonPlayerConnectionHandler (itr->first, this );
- delete(itr->second);
- itr++;
- }
- users.clear();
-}
-
-void BZFSHTTPServer::process ( bz_EventData *eventData )
-{
- if ( eventData->eventType == bz_eTickEvent)
- {
- if ( listening )
- update();
- }
- else if ( eventData->eventType == bz_eNewNonPlayerConnection )
- {
- if ( listening )
- {
- bz_NewNonPlayerConnectionEventData_V1 *connData = (bz_NewNonPlayerConnectionEventData_V1*)eventData;
- char *temp = (char*)malloc(connData->size+1);
- memcpy(temp,connData->data,connData->size);
- temp[connData->size] = 0;
- bz_debugMessagef(4,"Plugin HTTP Base: Non ProtoConnection connection from %d with %s",connData->connectionID,temp);
- free(temp);
-
- if(bz_registerNonPlayerConnectionHandler ( connData->connectionID, this ) )
- {
- if ( !users.size() )
- savedUpdateTime = bz_getMaxWaitTime();
-
- HTTPConnectedUsers *user = new HTTPConnectedUsers(connData->connectionID);
-
- users[connData->connectionID] = user;
- pending ( connData->connectionID, (char*)connData->data, connData->size );
- }
- }
- }
-}
-
-void BZFSHTTPServer::update ( void )
-{
- double now = bz_getCurrentTime();
- double timeout = 20;
-
- std::vector<int> killList;
-
- std::map<int,HTTPConnectedUsers*>::iterator itr = users.begin();
- while ( itr != users.end() )
- {
- double deadTime = now - itr->second->aliveTime;
- if ( itr->second->transferring() || deadTime < timeout )
- {
- itr->second->update();
- }
- else
- killList.push_back(itr->first);
- itr++;
- }
-
- for ( int i = 0; i < (int)killList.size(); i++ )
- {
- bz_removeNonPlayerConnectionHandler (i, this );
- delete(users[i]);
- users.erase(users.find(i));
- }
-
- if ( users.size())
- bz_setMaxWaitTime(0.001f);
- else
- bz_setMaxWaitTime(savedUpdateTime);
-}
-
-void BZFSHTTPServer::processTheCommand ( HTTPConnectedUsers *user, int requestID, const URLParams ¶ms )
-{
- if (acceptURL(theCurrentCommand->URL.c_str()))
- {
- int requestID = user->connection * 100 + user->pendingCommands.size();
-
- getURLData ( theCurrentCommand->URL.c_str(), requestID, params, theCurrentCommand->request == eGet );
-
- if (theCurrentCommand->data)
- {
- if (theCurrentCommand->size)
- user->startTransfer ( theCurrentCommand );
- else
- free(theCurrentCommand->data);
- }
- }
- else
- delete(theCurrentCommand);
-
- theCurrentCommand = NULL;
-}
-
-void BZFSHTTPServer::paramsFromString ( const std::string ¶mBlock, URLParams ¶ms )
-{
- std::vector<std::string> rawParams = tokenize(paramBlock,"&",0,false);
-
- for (int i =0; i < (int)rawParams.size(); i++ )
- {
- std::string paramItem = rawParams[i];
- if (paramItem.size())
- {
- std::vector<std::string> paramChunks = tokenize(paramItem,"=",2,false);
- if (paramChunks.size() > 1 )
- {
- std::string key = url_decode(replace_all(paramChunks[0],"+"," "));
- std::string value = url_decode(replace_all(paramChunks[1],"+"," "));
- params[key] = value;
- }
- }
- }
-}
-
-std::string BZFSHTTPServer::parseURLParams ( const std::string &FullURL, URLParams ¶ms )
-{
- std::string URL = FullURL;
-
- char *paramStart = strchr(URL.c_str(),'?');
- if ( paramStart != NULL )
- {
- std::string paramBlock = paramStart+1;
- // CHEAP but it works, and dosn't walk over memory
- *paramStart = 0;
- std::string temp = URL.c_str();
- URL = temp.c_str();
-
- paramsFromString(paramBlock,params);
- }
-
- return url_decode(URL);
-}
-
-void BZFSHTTPServer::pending ( int connectionID, void *d, unsigned int s )
-{
- std::map<int,HTTPConnectedUsers*>::iterator itr = users.find(connectionID);
- if (itr == users.end())
- return;
-
- HTTPConnectedUsers* user = itr->second;
-
- char *temp = (char*)malloc(s+1);
- memcpy(temp,d,s);
- temp[s] = 0;
- user->commandData += temp;
- free(temp);
-
- int requestID = connectionID*100 + (int)user->pendingCommands.size();
-
- if (strstr(user->commandData.c_str(),"\r\n") != NULL )
- {
- // we have enough to parse the HTTP command
- std::vector<std::string> commands = tokenize(user->commandData,std::string("\r\n"),0,false);
- for ( int i = 0; i < (int)commands.size(); i++)
- {
- if (strstr(user->commandData.c_str(),"\r\n") != NULL )
- {
- user->commandData.erase(user->commandData.begin(),user->commandData.begin()+commands[i].size()+2);
- std::vector<std::string> params = tokenize(commands[i],std::string(" "),0,false);
- if (params.size() > 1)
- {
- std::string httpCommandString = params[0];
-
- if (httpCommandString == "GET")
- {
- std::string url = params[1];
- // make sure it's in our vdir
- if ( strncmp(tolower(url).c_str()+1,tolower(vdir).c_str(),vdir.size()) == 0)
- {
- theCurrentCommand = new HTTPCommand;
- theCurrentCommand->request = eGet;
- theCurrentCommand->FullURL = params[1].c_str()+1+vdir.size();
- theCurrentCommand->data = NULL;
- theCurrentCommand->size = 0;
- theCurrentCommand->docType = eText;
- theCurrentCommand->returnCode = e200OK;
-
- URLParams params;
- theCurrentCommand->URL = parseURLParams ( theCurrentCommand->FullURL, params );
-
- processTheCommand(user,requestID,params);
- }
- }
- else if (httpCommandString == "POST")
- {
- std::string url = params[1];
- std::string paramData;
-
- // make sure it's in our vdir
- if ( strncmp(tolower(url).c_str()+1,tolower(vdir).c_str(),vdir.size()) == 0)
- {
- int i = (int)commands.size();
-
- for ( int c = 1; c < i; c++ )
- {
- std::string line = commands[c];
- if ( line.size() && strchr(line.c_str(),':') == NULL) // it's the post params
- {
- paramData += line;
- }
- }
-
- theCurrentCommand = new HTTPCommand;
- theCurrentCommand->request = ePost;
- theCurrentCommand->FullURL = params[1].c_str()+1+vdir.size();
- theCurrentCommand->data = NULL;
- theCurrentCommand->size = 0;
- theCurrentCommand->docType = eText;
- theCurrentCommand->returnCode = e200OK;
-
- theCurrentCommand->URL = url_decode( theCurrentCommand->FullURL);
- URLParams params;
- paramsFromString ( paramData, params );
-
- processTheCommand(user,requestID,params);
- }
- }
- }
- }
- }
- }
- else if ( user->commandData.size() > 4 )
- {
- if ( !user->transferring() && !user->pendingCommands.size() ) // it's not sending anything, and it has not goten any commands.
- {
- if ( strncmp(user->commandData.c_str(),"GET",3) != 0) // it is not a get
- {
- //if ( strncmp(user->commandData.c_str(),"POST",4) != 0) // it is not a post
- user->aliveTime = 99999999999.0; // then it's somethign we don't support, don't handle it
- }
- }
- }
-}
-
-void BZFSHTTPServer::disconnect ( int connectionID )
-{
- bz_removeNonPlayerConnectionHandler (connectionID, this );
- delete(users[connectionID]);
- users.erase(users.find(connectionID));
-}
-
-void BZFSHTTPServer::setURLDataSize ( unsigned int size, int requestID )
-{
- if (theCurrentCommand->data)
- free(theCurrentCommand->data);
-
- theCurrentCommand->data = NULL;
- theCurrentCommand->size = size;
-}
-
-void BZFSHTTPServer::setURLData ( const char * data, int requestID )
-{
- if (theCurrentCommand->data)
- {
- free(theCurrentCommand->data);
- theCurrentCommand->data = NULL;
- }
-
- if (theCurrentCommand->size)
- {
- theCurrentCommand->data = (char*)malloc(theCurrentCommand->size);
- memcpy(theCurrentCommand->data,data,theCurrentCommand->size);
- }
-}
-
-void BZFSHTTPServer::setURLDocType ( HTTPDocumentType docType, int requestID )
-{
- theCurrentCommand->docType = docType;
-}
-
-void BZFSHTTPServer::setURLReturnCode ( HTTPReturnCode code, int requestID )
-{
- theCurrentCommand->returnCode = code;
-}
-
-void BZFSHTTPServer::setURLRedirectLocation ( const char* location, int requestID )
-{
- if (!location)
- theCurrentCommand->redirectLocation = "";
- else
- theCurrentCommand->redirectLocation = location;
-}
-
-
-const char * BZFSHTTPServer::getBaseServerURL ( void )
-{
- return baseURL.c_str();
-}
-
-BZFSHTTPServer::HTTPConnectedUsers::HTTPConnectedUsers(int connectionID )
-{
- connection = connectionID;
- pos = 0;
-}
-
-BZFSHTTPServer::HTTPConnectedUsers::~HTTPConnectedUsers()
-{
- killMe();
-}
-
-void BZFSHTTPServer::HTTPConnectedUsers::killMe ( void )
-{
- for (int i = 0; i < (int)pendingCommands.size(); i++)
- {
- free(pendingCommands[i]->data);
- delete(pendingCommands[i]);
- }
- pendingCommands.clear();
- aliveTime -= 10000.0;
-}
-
-bool BZFSHTTPServer::HTTPConnectedUsers::transferring ( void )
-{
- if (!pendingCommands.size())
- return false;
-
- HTTPCommand *command = *pendingCommands.begin();
- return pos < command->size;
-}
-
-void BZFSHTTPServer::HTTPConnectedUsers::startTransfer ( HTTPCommand *command )
-{
- aliveTime = bz_getCurrentTime();
- pendingCommands.push_back(command);
- update();
-}
-std::string BZFSHTTPServer::HTTPConnectedUsers::getMimeType ( HTTPDocumentType docType )
-{
- std::string type = "text/plain";
- switch(docType)
- {
- case eOctetStream:
- type = "application/octet-stream";
- break;
-
- case eBinary:
- type = "application/binary";
- break;
-
- case eHTML:
- type = "text/html";
- break;
- }
- return type;
-}
-
-std::string BZFSHTTPServer::HTTPConnectedUsers::getReturnCode ( HTTPReturnCode returnCode )
-{
- std::string code = "200";
- switch(returnCode)
- {
- case e404NotFound:
- code = "404";
- break;
-
- case e403Forbiden:
- code = "403";
- break;
-
- case e301Redirect:
- code = "301";
- break;
-
- case e500ServerError:
- code = "500";
- break;
- }
-
- return code;
-}
-
-void BZFSHTTPServer::HTTPConnectedUsers::update ( void )
-{
- if (!pendingCommands.size())
- return;
-
- HTTPCommand *currentCommand = pendingCommands[0];
- if ( pos == 0 )
- {
- // start a new one
- std::string httpHeaders;
- httpHeaders += "HTTP/1.1 200 OK\n";
- httpHeaders += format("Content-Length: %d\n", (int)currentCommand->size);
- httpHeaders += "Connection: close\n";
- httpHeaders += "Content-Type: " + getMimeType(currentCommand->docType) + "\n";
- if (currentCommand->returnCode != e301Redirect)
- httpHeaders += "Status-Code: " + getReturnCode(currentCommand->returnCode) + "\n";
- else
- {
- if ( currentCommand->redirectLocation.size() )
- {
- httpHeaders += "Status-Code: " + getReturnCode(currentCommand->returnCode) + "\n";
- httpHeaders += "Location: " + currentCommand->redirectLocation + "\n";
- }
- else // yeah WTF, you want a redirect but don't have a URL, dude
- httpHeaders += "Status-Code: " + getReturnCode(e500ServerError) + "\n";
- }
- httpHeaders += "\n";
-
- if ( !bz_sendNonPlayerData ( connection, httpHeaders.c_str(), (unsigned int)httpHeaders.size()) )
- {
- killMe();
- return;
- }
- }
-
- // keep it going
- // wait till the current data is sent
- if (bz_getNonPlayerConnectionOutboundPacketCount(connection) == 0)
- {
- int chunkToSend = 1000;
-
- if ( pos + chunkToSend > currentCommand->size)
- chunkToSend = currentCommand->size-pos;
-
- bool worked = bz_sendNonPlayerData ( connection, currentCommand->data+pos, chunkToSend );
-
- pos += chunkToSend;
- if (pos >= currentCommand->size) // if we are done, close this sucker
- {
- pos = 0;
- free(currentCommand->data);
- delete(currentCommand);
- pendingCommands.erase(pendingCommands.begin());
- }
- }
-}
-
-// Local Variables: ***
-// mode:C++ ***
-// tab-width: 8 ***
-// c-basic-offset: 2 ***
-// indent-tabs-mode: t ***
-// End: ***
-// ex: shiftwidth=2 tabstop=8
+/* bzflag
+* Copyright (c) 1993 - 2007 Tim Riker
+*
+* This package is free software; you can redistribute it and/or
+* modify it under the terms of the license found in the file
+* named COPYING that should have accompanied this file.
+*
+* THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+#include "plugin_HTTP.h"
+#include "plugin_utils.h"
+#include <algorithm>
+
+BZFSHTTPServer::BZFSHTTPServer( const char * plugInName )
+{
+ listening = false;
+
+ vdir = format("%d/",this);
+ std::string clipField;
+ std::vector<std::string> dirs;
+
+ if (bz_clipFieldExists ( "BZFS_HTTPD_VDIRS" ) && bz_getclipFieldString("BZFS_HTTPD_VDIRS")[0] != 0)
+ {
+ clipField = bz_getclipFieldString("BZFS_HTTPD_VDIRS");
+ dirs = tokenize(clipField,std::string(","),0,false);
+
+ if (plugInName && tolower(std::string(plugInName)) != "bzfs")
+ {
+ if (std::find(dirs.begin(),dirs.end(),std::string(plugInName)) == dirs.end())
+ vdir = plugInName;
+ }
+ }
+ else
+ {
+ if (plugInName && tolower(std::string(plugInName)) != "bzfs")
+ vdir = plugInName;
+ }
+
+ clipField += "," + vdir;
+
+ bz_setclipFieldString ( "BZFS_HTTPD_VDIRS", clipField.c_str() );
+
+ // see if I am the indexer or not
+ if (!bz_clipFieldExists ( "BZFS_HTTPD_INDEXER" ) || bz_getclipFieldString("BZFS_HTTPD_INDEXER")[0] == 0)
+ bz_setclipFieldString("BZFS_HTTPD_INDEXER",format("%d",(int)this).c_str());
+}
+
+BZFSHTTPServer::~BZFSHTTPServer()
+{
+ shutdownHTTP();
+
+ // clear out the
+ if (bz_clipFieldExists ( "BZFS_HTTPD_INDEXER" ))
+ {
+ std::string myThis = format("%d",(int)this);
+ if (bz_getclipFieldString("BZFS_HTTPD_INDEXER") == myThis)
+ bz_setclipFieldString("BZFS_HTTPD_INDEXER","");
+ }
+
+ if (bz_clipFieldExists ( "BZFS_HTTPD_VDIRS" ) && bz_getclipFieldString("BZFS_HTTPD_VDIRS")[0] != 0)
+ {
+ std::string clipField = bz_getclipFieldString("BZFS_HTTPD_VDIRS");
+ std::vector<std::string> dirs = tokenize(clipField,std::string(","),0,false);
+
+ clipField = "";
+ for ( int i = 0; i < (int)dirs.size(); i++ )
+ {
+ if ( dirs[i] != dirs[i] )
+ clipField += vdir + ",";
+ }
+ bz_setclipFieldString("BZFS_HTTPD_VDIRS",clipField.c_str());
+ }
+}
+
+void BZFSHTTPServer::startupHTTP ( void )
+{
+ shutdownHTTP();
+
+ bz_registerEvent (bz_eTickEvent,this);
+ bz_registerEvent (bz_eNewNonPlayerConnection,this);
+
+ baseURL = "http://";
+ std::string host = "localhost:5154";
+ if (bz_getPublicAddr().size())
+ host = bz_getPublicAddr().c_str();
+
+ // make sure it has the port
+ if ( strrchr(host.c_str(),':') == NULL )
+ host += format(":%d",bz_getPublicPort());
+
+ baseURL += host;
+ baseURL += "/" + vdir + "/";
+
+ listening = true;
+}
+
+void BZFSHTTPServer::shutdownHTTP ( void )
+{
+ if (!listening)
+ return;
+
+ bz_removeEvent (bz_eTickEvent,this);
+ bz_removeEvent (bz_eNewNonPlayerConnection,this);
+
+ // kill the users;
+ std::map<int,HTTPConnectedUsers*>::iterator itr = users.begin();
+ while ( itr != users.end() )
+ {
+ bz_removeNonPlayerConnectionHandler (itr->first, this );
+ delete(itr->second);
+ itr++;
+ }
+ users.clear();
+}
+
+void BZFSHTTPServer::process ( bz_EventData *eventData )
+{
+ if ( eventData->eventType == bz_eTickEvent)
+ {
+ if ( listening )
+ update();
+ }
+ else if ( eventData->eventType == bz_eNewNonPlayerConnection )
+ {
+ if ( listening )
+ {
+ bz_NewNonPlayerConnectionEventData_V1 *connData = (bz_NewNonPlayerConnectionEventData_V1*)eventData;
+ char *temp = (char*)malloc(connData->size+1);
+ memcpy(temp,connData->data,connData->size);
+ temp[connData->size] = 0;
+ bz_debugMessagef(4,"Plugin HTTP Base: Non ProtoConnection connection from %d with %s",connData->connectionID,temp);
+ free(temp);
+
+ if(bz_registerNonPlayerConnectionHandler ( connData->connectionID, this ) )
+ {
+ if ( !users.size() )
+ savedUpdateTime = bz_getMaxWaitTime();
+
+ HTTPConnectedUsers *user = new HTTPConnectedUsers(connData->connectionID);
+
+ users[connData->connectionID] = user;
+ pending ( connData->connectionID, (char*)connData->data, connData->size );
+ }
+ }
+ }
+}
+
+void BZFSHTTPServer::update ( void )
+{
+ double now = bz_getCurrentTime();
+ double timeout = 20;
+
+ std::vector<int> killList;
+
+ std::map<int,HTTPConnectedUsers*>::iterator itr = users.begin();
+ while ( itr != users.end() )
+ {
+ double deadTime = now - itr->second->aliveTime;
+ if ( itr->second->transferring() || deadTime < timeout )
+ {
+ itr->second->update();
+ }
+ else
+ killList.push_back(itr->first);
+ itr++;
+ }
+
+ for ( int i = 0; i < (int)killList.size(); i++ )
+ {
+ bz_removeNonPlayerConnectionHandler (i, this );
+ delete(users[i]);
+ users.erase(users.find(i));
+ }
+
+ if ( users.size())
+ bz_setMaxWaitTime(0.001f);
+ else
+ bz_setMaxWaitTime(savedUpdateTime);
+}
+
+void BZFSHTTPServer::processTheCommand ( HTTPConnectedUsers *user, int requestID, const URLParams ¶ms )
+{
+ if (acceptURL(theCurrentCommand->URL.c_str()))
+ {
+ int requestID = user->connection * 100 + user->pendingCommands.size();
+
+ getURLData ( theCurrentCommand->URL.c_str(), requestID, params, theCurrentCommand->request == eGet );
+
+ if (theCurrentCommand->data)
+ {
+ if (theCurrentCommand->size)
+ user->startTransfer ( theCurrentCommand );
+ else
+ free(theCurrentCommand->data);
+ }
+ }
+ else
+ delete(theCurrentCommand);
+
+ theCurrentCommand = NULL;
+}
+
+void BZFSHTTPServer::paramsFromString ( const std::string ¶mBlock, URLParams ¶ms )
+{
+ std::vector<std::string> rawParams = tokenize(paramBlock,"&",0,false);
+
+ for (int i =0; i < (int)rawParams.size(); i++ )
+ {
+ std::string paramItem = rawParams[i];
+ if (paramItem.size())
+ {
+ std::vector<std::string> paramChunks = tokenize(paramItem,"=",2,false);
+ if (paramChunks.size() > 1 )
+ {
+ std::string key = url_decode(replace_all(paramChunks[0],"+"," "));
+ std::string value = url_decode(replace_all(paramChunks[1],"+"," "));
+ params[key] = value;
+ }
+ }
+ }
+}
+
+std::string BZFSHTTPServer::parseURLParams ( const std::string &FullURL, URLParams ¶ms )
+{
+ std::string URL = FullURL;
+
+ char *paramStart = strchr(URL.c_str(),'?');
+ if ( paramStart != NULL )
+ {
+ std::string paramBlock = paramStart+1;
+ // CHEAP but it works, and dosn't walk over memory
+ *paramStart = 0;
+ std::string temp = URL.c_str();
+ URL = temp.c_str();
+
+ paramsFromString(paramBlock,params);
+ }
+
+ return url_decode(URL);
+}
+
+void BZFSHTTPServer::pending ( int connectionID, void *d, unsigned int s )
+{
+ std::map<int,HTTPConnectedUsers*>::iterator itr = users.find(connectionID);
+ if (itr == users.end())
+ return;
+
+ HTTPConnectedUsers* user = itr->second;
+
+ char *temp = (char*)malloc(s+1);
+ memcpy(temp,d,s);
+ temp[s] = 0;
+ user->commandData += temp;
+ free(temp);
+
+ int requestID = connectionID*100 + (int)user->pendingCommands.size();
+
+ if (strstr(user->commandData.c_str(),"\r\n") != NULL )
+ {
+ // we have enough to parse the HTTP command
+ std::vector<std::string> commands = tokenize(user->commandData,std::string("\r\n"),0,false);
+ for ( int i = 0; i < (int)commands.size(); i++)
+ {
+ if (strstr(user->commandData.c_str(),"\r\n") != NULL )
+ {
+ user->commandData.erase(user->commandData.begin(),user->commandData.begin()+commands[i].size()+2);
+ std::vector<std::string> params = tokenize(commands[i],std::string(" "),0,false);
+ if (params.size() > 1)
+ {
+ std::string httpCommandString = params[0];
+
+ if (httpCommandString == "GET")
+ {
+ std::string url = params[1];
+ // make sure it's in our vdir
+ if ( strncmp(tolower(url).c_str()+1,tolower(vdir).c_str(),vdir.size()) == 0)
+ {
+ theCurrentCommand = new HTTPCommand;
+ theCurrentCommand->request = eGet;
+ theCurrentCommand->FullURL = params[1].c_str()+1+vdir.size();
+ theCurrentCommand->data = NULL;
+ theCurrentCommand->size = 0;
+ theCurrentCommand->docType = eText;
+ theCurrentCommand->returnCode = e200OK;
+
+ URLParams params;
+ theCurrentCommand->URL = parseURLParams ( theCurrentCommand->FullURL, params );
+
+ processTheCommand(user,requestID,params);
+ }
+ }
+ else if (httpCommandString == "POST")
+ {
+ std::string url = params[1];
+ std::string paramData;
+
+ // make sure it's in our vdir
+ if ( strncmp(tolower(url).c_str()+1,tolower(vdir).c_str(),vdir.size()) == 0)
+ {
+ int i = (int)commands.size();
+
+ for ( int c = 1; c < i; c++ )
+ {
+ std::string line = commands[c];
+ if ( line.size() && strchr(line.c_str(),':') == NULL) // it's the post params
+ {
+ paramData += line;
+ }
+ }
+
+ theCurrentCommand = new HTTPCommand;
+ theCurrentCommand->request = ePost;
+ theCurrentCommand->FullURL = params[1].c_str()+1+vdir.size();
+ theCurrentCommand->data = NULL;
+ theCurrentCommand->size = 0;
+ theCurrentCommand->docType = eText;
+ theCurrentCommand->returnCode = e200OK;
+
+ theCurrentCommand->URL = url_decode( theCurrentCommand->FullURL);
+ URLParams params;
+ paramsFromString ( paramData, params );
+
+ processTheCommand(user,requestID,params);
+ }
+ }
+ }
+ }
+ }
+ }
+ else if ( user->commandData.size() > 4 )
+ {
+ if ( !user->transferring() && !user->pendingCommands.size() ) // it's not sending anything, and it has not goten any commands.
+ {
+ if ( strncmp(user->commandData.c_str(),"GET",3) != 0) // it is not a get
+ {
+ //if ( strncmp(user->commandData.c_str(),"POST",4) != 0) // it is not a post
+ user->aliveTime = 99999999999.0; // then it's somethign we don't support, don't handle it
+ }
+ }
+ }
+}
+
+void BZFSHTTPServer::disconnect ( int connectionID )
+{
+ bz_removeNonPlayerConnectionHandler (connectionID, this );
+ delete(users[connectionID]);
+ users.erase(users.find(connectionID));
+}
+
+void BZFSHTTPServer::setURLDataSize ( unsigned int size, int requestID )
+{
+ if (theCurrentCommand->data)
+ free(theCurrentCommand->data);
+
+ theCurrentCommand->data = NULL;
+ theCurrentCommand->size = size;
+}
+
+void BZFSHTTPServer::setURLData ( const char * data, int requestID )
+{
+ if (theCurrentCommand->data)
+ {
+ free(theCurrentCommand->data);
+ theCurrentCommand->data = NULL;
+ }
+
+ if (theCurrentCommand->size)
+ {
+ theCurrentCommand->data = (char*)malloc(theCurrentCommand->size);
+ memcpy(theCurrentCommand->data,data,theCurrentCommand->size);
+ }
+}
+
+void BZFSHTTPServer::setURLDocType ( HTTPDocumentType docType, int requestID )
+{
+ theCurrentCommand->docType = docType;
+}
+
+void BZFSHTTPServer::setURLReturnCode ( HTTPReturnCode code, int requestID )
+{
+ theCurrentCommand->returnCode = code;
+}
+
+void BZFSHTTPServer::setURLRedirectLocation ( const char* location, int requestID )
+{
+ if (!location)
+ theCurrentCommand->redirectLocation = "";
+ else
+ theCurrentCommand->redirectLocation = location;
+}
+
+
+const char * BZFSHTTPServer::getBaseServerURL ( void )
+{
+ return baseURL.c_str();
+}
+
+BZFSHTTPServer::HTTPConnectedUsers::HTTPConnectedUsers(int connectionID )
+{
+ connection = connectionID;
+ pos = 0;
+}
+
+BZFSHTTPServer::HTTPConnectedUsers::~HTTPConnectedUsers()
+{
+ killMe();
+}
+
+void BZFSHTTPServer::HTTPConnectedUsers::killMe ( void )
+{
+ for (int i = 0; i < (int)pendingCommands.size(); i++)
+ {
+ free(pendingCommands[i]->data);
+ delete(pendingCommands[i]);
+ }
+ pendingCommands.clear();
+ aliveTime -= 10000.0;
+}
+
+bool BZFSHTTPServer::HTTPConnectedUsers::transferring ( void )
+{
+ if (!pendingCommands.size())
+ return false;
+
+ HTTPCommand *command = *pendingCommands.begin();
+ return pos < command->size;
+}
+
+void BZFSHTTPServer::HTTPConnectedUsers::startTransfer ( HTTPCommand *command )
+{
+ aliveTime = bz_getCurrentTime();
+ pendingCommands.push_back(command);
+ update();
+}
+std::string BZFSHTTPServer::HTTPConnectedUsers::getMimeType ( HTTPDocumentType docType )
+{
+ std::string type = "text/plain";
+ switch(docType)
+ {
+ case eOctetStream:
+ type = "application/octet-stream";
+ break;
+
+ case eBinary:
+ type = "application/binary";
+ break;
+
+ case eHTML:
+ type = "text/html";
+ break;
+ }
+ return type;
+}
+
+std::string BZFSHTTPServer::HTTPConnectedUsers::getReturnCode ( HTTPReturnCode returnCode )
+{
+ std::string code = "200";
+ switch(returnCode)
+ {
+ case e404NotFound:
+ code = "404";
+ break;
+
+ case e403Forbiden:
+ code = "403";
+ break;
+
+ case e301Redirect:
+ code = "301";
+ break;
+
+ case e500ServerError:
+ code = "500";
+ break;
+ }
+
+ return code;
+}
+
+void BZFSHTTPServer::HTTPConnectedUsers::update ( void )
+{
+ if (!pendingCommands.size())
+ return;
+
+ HTTPCommand *currentCommand = pendingCommands[0];
+ if ( pos == 0 )
+ {
+ // start a new one
+ std::string httpHeaders;
+ httpHeaders += "HTTP/1.1 200 OK\n";
+ httpHeaders += format("Content-Length: %d\n", (int)currentCommand->size);
+ httpHeaders += "Connection: close\n";
+ httpHeaders += "Content-Type: " + getMimeType(currentCommand->docType) + "\n";
+ if (currentCommand->returnCode != e301Redirect)
+ httpHeaders += "Status-Code: " + getReturnCode(currentCommand->returnCode) + "\n";
+ else
+ {
+ if ( currentCommand->redirectLocation.size() )
+ {
+ httpHeaders += "Status-Code: " + getReturnCode(currentCommand->returnCode) + "\n";
+ httpHeaders += "Location: " + currentCommand->redirectLocation + "\n";
+ }
+ else // yeah WTF, you want a redirect but don't have a URL, dude
+ httpHeaders += "Status-Code: " + getReturnCode(e500ServerError) + "\n";
+ }
+ httpHeaders += "\n";
+
+ if ( !bz_sendNonPlayerData ( connection, httpHeaders.c_str(), (unsigned int)httpHeaders.size()) )
+ {
+ killMe();
+ return;
+ }
+ }
+
+ // keep it going
+ // wait till the current data is sent
+ if (bz_getNonPlayerConnectionOutboundPacketCount(connection) == 0)
+ {
+ int chunkToSend = 1000;
+
+ if ( pos + chunkToSend > currentCommand->size)
+ chunkToSend = currentCommand->size-pos;
+
+ bool worked = bz_sendNonPlayerData ( connection, currentCommand->data+pos, chunkToSend );
+
+ pos += chunkToSend;
+ if (pos >= currentCommand->size) // if we are done, close this sucker
+ {
+ pos = 0;
+ free(currentCommand->data);
+ delete(currentCommand);
+ pendingCommands.erase(pendingCommands.begin());
+ }
+ }
+}
+
+// Local Variables: ***
+// mode:C++ ***
+// tab-width: 8 ***
+// c-basic-offset: 2 ***
+// indent-tabs-mode: t ***
+// End: ***
+// ex: shiftwidth=2 tabstop=8
Modified: trunk/bzflag/plugins/plugin_utils/plugin_HTTP.h
===================================================================
--- trunk/bzflag/plugins/plugin_utils/plugin_HTTP.h 2007-09-08 00:54:01 UTC (rev 15812)
+++ trunk/bzflag/plugins/plugin_utils/plugin_HTTP.h 2007-09-08 00:55:23 UTC (rev 15813)
@@ -71,7 +71,7 @@
// so the server can know what it's address is
const char * getBaseServerURL ( void );
- const char * getVDir ( void ) {return vdir.c_str();}
+ const char * getVDir ( void ) {return vdir.c_str();}
protected:
typedef enum
Modified: trunk/bzflag/plugins/plugin_utils/plugin_files.cpp
===================================================================
--- trunk/bzflag/plugins/plugin_utils/plugin_files.cpp 2007-09-08 00:54:01 UTC (rev 15812)
+++ trunk/bzflag/plugins/plugin_utils/plugin_files.cpp 2007-09-08 00:55:23 UTC (rev 15813)
@@ -221,8 +221,8 @@
{
FilePath = searchstr;
FilePath += fileInfo->d_name;
-
+
stat(FilePath.c_str(), &statbuf);
if (justDirs && S_ISDIR(statbuf.st_mode)) // we never do just dirs recrusively
Modified: trunk/bzflag/plugins/webstats/webstats.cpp
===================================================================
--- trunk/bzflag/plugins/webstats/webstats.cpp 2007-09-08 00:54:01 UTC (rev 15812)
+++ trunk/bzflag/plugins/webstats/webstats.cpp 2007-09-08 00:55:23 UTC (rev 15813)
@@ -1,127 +1,127 @@
-// webstats.cpp : Defines the entry point for the DLL application.
-//
-
-#include "bzfsAPI.h"
-#include "plugin_utils.h"
-#include "plugin_HTTP.h"
-
+// webstats.cpp : Defines the entry point for the DLL application.
+//
+
+#include "bzfsAPI.h"
+#include "plugin_utils.h"
+#include "plugin_HTTP.h"
+
class WebStats : public BZFSHTTPServer
-{
-public:
- WebStats( const char * plugInName ): BZFSHTTPServer(plugInName){};
-
- virtual bool acceptURL ( const char *url ){return true;}
- virtual void getURLData ( const char* url, int requestID, const URLParams ¶maters, bool get = true );
+{
+public:
+ WebStats( const char * plugInName ): BZFSHTTPServer(plugInName){};
+
+ virtual bool acceptURL ( const char *url ){return true;}
+ virtual void getURLData ( const char* url, int requestID, const URLParams ¶maters, bool get = true );
};
-
-WebStats webStats("webstats");
-
-BZ_GET_PLUGIN_VERSION
-
-BZF_PLUGIN_CALL int bz_Load ( const char* /*commandLine*/ )
-{
- bz_debugMessage(4,"webstats plugin loaded");
+
+WebStats webStats("webstats");
+
+BZ_GET_PLUGIN_VERSION
+
+BZF_PLUGIN_CALL int bz_Load ( const char* /*commandLine*/ )
+{
+ bz_debugMessage(4,"webstats plugin loaded");
webStats.startupHTTP();
-
- return 0;
-}
-
-BZF_PLUGIN_CALL int bz_Unload ( void )
-{
- webStats.shutdownHTTP();
- bz_debugMessage(4,"webstats plugin unloaded");
- return 0;
-}
-
-std::string teamToString ( bz_eTeamType team )
-{
- std::string name = "Unknown Team";
- switch(team)
- {
- case eRogueTeam:
- name = "Rogue";
- break;
- case eRedTeam:
- name = "Red";
- break;
- case eGreenTeam:
- name = "Green";
- break;
- case eBlueTeam:
- name = "Blue";
- break;
- case ePurpleTeam:
- name = "Purple";
- break;
- case eRabbitTeam:
- name = "Rabbit";
- break;
- case eHunterTeam:
- name = "Hunter";
- break;
- }
-
- return name;
-}
-
-void WebStats::getURLData ( const char* url, int requestID, const URLParams ¶maters, bool get )
-{
- std::string page;
- page = "<HTML><HEAD></HEAD><BODY>\n<BR>\n";
-
- std::string publicAddr = bz_getPublicAddr().c_str();
- page = "Stats for";
- page += publicAddr + "<br>\n";
-
- bz_APIIntList *players = bz_getPlayerIndexList();
-
- if ( !players->size() )
- page += "There are no players :(\n";
-
- for ( int i = 0; i < (int)players->size(); i++ )
- {
- int player = players->get(i);
-
- bz_BasePlayerRecord *rec = bz_getPlayerByIndex (player);
- if (rec)
- {
- page += rec->callsign.c_str();
- page += " ";
- if ( rec->team != eObservers )
- {
- page += teamToString(rec->team);
- page += format(" Wins=%d Losses=%d TKs=%d",rec->wins,rec->losses,rec->teamKills);
- if ( rec->admin )
- page += " Admin";
-
- if ( rec->spawned )
- page += " Spawned";
-
- if ( rec->verified )
- page += " Verified";
- }
- else
- page += "Observer";
-
- page += "<br>\n";
- bz_freePlayerRecord (rec);
- }
- }
- bz_deleteIntList(players);
-
- page += "<BR></body></HTML>";
-
- setURLDocType(eHTML,requestID);
- setURLDataSize ( (unsigned int)page.size(), requestID );
- setURLData ( page.c_str(), requestID );
-
-}
-
-
-// Local Variables: ***
-// mode:C++ ***
-// tab-width: 8 ***
-// c-basic-offset: 2 ***
-// indent-tabs-mode: t ***
-// End: ***
-// ex: shiftwidth=2 tabstop=8
+
+ return 0;
+}
+
+BZF_PLUGIN_CALL int bz_Unload ( void )
+{
+ webStats.shutdownHTTP();
+ bz_debugMessage(4,"webstats plugin unloaded");
+ return 0;
+}
+
+std::string teamToString ( bz_eTeamType team )
+{
+ std::string name = "Unknown Team";
+ switch(team)
+ {
+ case eRogueTeam:
+ name = "Rogue";
+ break;
+ case eRedTeam:
+ name = "Red";
+ break;
+ case eGreenTeam:
+ name = "Green";
+ break;
+ case eBlueTeam:
+ name = "Blue";
+ break;
+ case ePurpleTeam:
+ name = "Purple";
+ break;
+ case eRabbitTeam:
+ name = "Rabbit";
+ break;
+ case eHunterTeam:
+ name = "Hunter";
+ break;
+ }
+
+ return name;
+}
+
+void WebStats::getURLData ( const char* url, int requestID, const URLParams ¶maters, bool get )
+{
+ std::string page;
+ page = "<HTML><HEAD></HEAD><BODY>\n<BR>\n";
+
+ std::string publicAddr = bz_getPublicAddr().c_str();
+ page = "Stats for";
+ page += publicAddr + "<br>\n";
+
+ bz_APIIntList *players = bz_getPlayerIndexList();
+
+ if ( !players->size() )
+ page += "There are no players :(\n";
+
+ for ( int i = 0; i < (int)players->size(); i++ )
+ {
+ int player = players->get(i);
+
+ bz_BasePlayerRecord *rec = bz_getPlayerByIndex (player);
+ if (rec)
+ {
+ page += rec->callsign.c_str();
+ page += " ";
+ if ( rec->team != eObservers )
+ {
+ page += teamToString(rec->team);
+ page += format(" Wins=%d Losses=%d TKs=%d",rec->wins,rec->losses,rec->teamKills);
+ if ( rec->admin )
+ page += " Admin";
+
+ if ( rec->spawned )
+ page += " Spawned";
+
+ if ( rec->verified )
+ page += " Verified";
+ }
+ else
+ page += "Observer";
+
+ page += "<br>\n";
+ bz_freePlayerRecord (rec);
+ }
+ }
+ bz_deleteIntList(players);
+
+ page += "<BR></body></HTML>";
+
+ setURLDocType(eHTML,requestID);
+ setURLDataSize ( (unsigned int)page.size(), requestID );
+ setURLData ( page.c_str(), requestID );
+
+}
+
+
+// Local Variables: ***
+// mode:C++ ***
+// tab-width: 8 ***
+// c-basic-offset: 2 ***
+// indent-tabs-mode: t ***
+// End: ***
+// ex: shiftwidth=2 tabstop=8
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|