diff --git a/COPYING b/COPYING new file mode 100755 index 0000000..d60c31a --- /dev/null +++ b/COPYING @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/src/Makefile b/src/Makefile new file mode 100644 index 0000000..0e87b03 --- /dev/null +++ b/src/Makefile @@ -0,0 +1,30 @@ +#This is the makefile + + +build/oastat: build/oastat.o build/db2stdout.o build/oastatstruct.o build/kill2db.o build/init2db.o build/shutdown2db.o build/userinfo2db.o build/disconnect2db.o + g++ -O -o build/oastat build/oastat.o build/db2stdout.o build/oastatstruct.o build/kill2db.o build/init2db.o build/shutdown2db.o build/userinfo2db.o build/disconnect2db.o -lgcrypt + +build/oastat.o: oastat.cpp + g++ -c -g oastat.cpp -o build/oastat.o + +build/db2stdout.o: db/db2stdout.cpp db/db2stdout.h db/database.hpp + g++ -c -g db/db2stdout.cpp -o build/db2stdout.o + +build/oastatstruct.o: oastatstruct.cpp oastatstruct.h + g++ -c -g oastatstruct.cpp -o build/oastatstruct.o + +build/kill2db.o: oss2db/kill2db.cpp oss2db/kill2db.h + g++ -c -g oss2db/kill2db.cpp -o build/kill2db.o + +build/init2db.o: oss2db/init2db.cpp oss2db/init2db.h + g++ -c -g oss2db/init2db.cpp -o build/init2db.o + +build/shutdown2db.o: oss2db/shutdown2db.cpp oss2db/shutdown2db.h + g++ -c -g oss2db/shutdown2db.cpp -o build/shutdown2db.o + +build/userinfo2db.o: oss2db/userinfo2db.cpp oss2db/userinfo2db.h + g++ -c -g oss2db/userinfo2db.cpp -o build/userinfo2db.o + +build/disconnect2db.o: oss2db/Disconnect2Db.cpp oss2db/Disconnect2Db.h + g++ -c -g oss2db/Disconnect2Db.cpp -o build/disconnect2db.o + diff --git a/src/db/database.hpp b/src/db/database.hpp new file mode 100644 index 0000000..a856852 --- /dev/null +++ b/src/db/database.hpp @@ -0,0 +1,31 @@ +#ifndef _DATABASE_H +#define _DATABASE_H + +#include +#include + +using namespace std; + +/* + This is the class that all database connections need to inherit to be able to recieve data from the program + */ +class Database { + public: + virtual void createTables() = 0; + + virtual void startGame(int gametype, string mapname, string basegame) = 0; + + virtual void endGame(int second) = 0; + + virtual int getGameNumber() = 0; + + virtual void setPlayerInfo(string guid, string nickname, bool isBot, int second, int team, string model, string headmodel, int skill = -1) = 0; + + virtual void addKill(int second, string attackerID, string targetID, int type) = 0; + + virtual void addCapture(int second, string player, int team) = 0; + + virtual void addAward(int second, string player, int award) = 0; +}; + +#endif //_DATABASE_H diff --git a/src/db/db2stdout.cpp b/src/db/db2stdout.cpp new file mode 100644 index 0000000..ade57df --- /dev/null +++ b/src/db/db2stdout.cpp @@ -0,0 +1,86 @@ +/* + * File: db2stdout.cpp + * Author: poul + * + * Created on 6. marts 2010, 22:08 + */ + +#include "db2stdout.h" +#include + +static int gamecount = 1; //Only to standard out, normally this should be read from db!!! + +/*Note: I use printf instead of cout because that is closest to the format that most databases expect. + Most databases want :1,:2 instead of %s,%s and no quetes but still*/ +#define STARTGAME "INSERT INTO oastat_games(gametype, mapname, basegame) VALUES (%i,'%s','%s');" +#define PLAYERSINSERT "INSERT INTO oastat_players(guid,nickname,lastseen,isBot, model, headmodel) VALUES ('%s','%s',now(),%s,'%s','%s');" +#define PLAYERSUPDATE "UPDATE oastat_players SET nickname = '%s',lastseen = now(),isBot = %s, model = '%s', headmodel = '%s' WHERE guid = '%s';" +#define USERINFOINSERT "INSERT INTO oastat_userinfo(gamenumber,second,guid,team,model,skill) VALUES (%i,%i,'%s',%i,'%s',%i);" +#define ENDGAME "UPDATE oastat_games SET second=%i,time = now() where gamenumber = %i;" +#define KILL "INSERT INTO oastat_kills(gamenumber,second,attacker,target,modtype) VALUES(%i,%i,'%s','%s',%i);" +#define CAPTURE "INSERT INTO oastat_captures(gamenumber,second,player,team) VALUES (%i,%i,'%s',%i);" +#define AWARD "INSERT INTO oastat_awards(gamenumber,second,player,award) VALUES (%i,%i,'%s',%i);" + +static char* booltext[2] = {"false","true"}; + +DB2stdout::DB2stdout() { +} + +DB2stdout::~DB2stdout() { +} + +void DB2stdout::createTables() +{ + //Nothing to do + cout << "CREATE TABLE(S) ..." << endl; +} + +void DB2stdout::startGame(int gametype, string mapname, string basegame) +{ + printf(STARTGAME,gametype,mapname.c_str(),basegame.c_str()); + cout << endl; + gamecount++; //Only to standard out, normally this should be read from db!!! +} + +int DB2stdout::getGameNumber() +{ + return gamecount; //Only to standard out, normally this should be read from db!!! +} + +void DB2stdout::setPlayerInfo(string guid, string nickname, bool isBot, int second, int team, string model, string headmodel, int skill) +{ + //If team < 0 then it is a disconnect event that need not to be in + if(team>-1) + { + printf(PLAYERSINSERT,guid.c_str(),nickname.c_str(),booltext[isBot],model.c_str(),headmodel.c_str()); + cout << endl; + printf(PLAYERSUPDATE,nickname.c_str(),booltext[isBot],model.c_str(),headmodel.c_str(),guid.c_str()); + cout << endl; + } + printf(USERINFOINSERT,getGameNumber(),second,guid.c_str(),team,model.c_str(),skill); + cout << endl; +} + +void DB2stdout::addKill(int second, string attackerID, string targetID, int type) +{ + printf(KILL,gamenumber,second,attackerID.c_str(),targetID.c_str(),type); + cout << endl; +} + +void DB2stdout::endGame(int second) +{ + printf(ENDGAME,second,gamenumber); + cout << endl; +} + +void DB2stdout::addCapture(int second, string player, int team) +{ + printf(CAPTURE,gamenumber,second,player.c_str(),team); + cout << endl; +} + +void DB2stdout::addAward(int second, string player, int award) +{ + printf(AWARD,gamenumber,second,player.c_str(),award); + cout << endl; +} \ No newline at end of file diff --git a/src/db/db2stdout.h b/src/db/db2stdout.h new file mode 100644 index 0000000..d0ddaab --- /dev/null +++ b/src/db/db2stdout.h @@ -0,0 +1,32 @@ +/* + * File: db2stdout.h + * Author: poul + * + * Created on 6. marts 2010, 22:08 + */ + +#ifndef _DB2STDOUT_H +#define _DB2STDOUT_H + +#include "database.hpp" + +using namespace std; + +class DB2stdout : public Database { +public: + DB2stdout(); + ~DB2stdout(); + void createTables(); + void startGame(int gametype, string mapname, string basegame); + void endGame(int second); + int getGameNumber(); + void setPlayerInfo(string guid, string nickname, bool isBot, int second, int team, string model, string headmodel, int skill); + void addKill(int second, string attackerID, string targetID, int type); + void addCapture(int second, string player, int team); + void addAward(int second, string player, int award); +private: + int gamenumber; +}; + +#endif /* _DB2STDOUT_H */ + diff --git a/src/local.h b/src/local.h new file mode 100644 index 0000000..9b97273 --- /dev/null +++ b/src/local.h @@ -0,0 +1,22 @@ +/* + * File: local.h + * Author: poul + * + * Created on 21. marts 2010, 12:14 + */ + +#ifndef _LOCAL_H +#define _LOCAL_H + +#define MAX_ID 128 + +#include "oastatstruct.h" + +/* This array contains all the guid hashes of the players in a game */ +extern string clientIdMap[MAX_ID]; + +/* returns the SHA-1 code of the parameter */ +extern string getHashedId(string unhashedID); + +#endif /* _LOCAL_H */ + diff --git a/src/oastat.cpp b/src/oastat.cpp new file mode 100644 index 0000000..4270937 --- /dev/null +++ b/src/oastat.cpp @@ -0,0 +1,142 @@ +/* +=========================================================================== +oastat - OpenArena stat program +Copyright (C) 2010 Poul Sander (oastat@poulsander.com) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +=========================================================================== +*/ + +#define VERSION "0.1 BETA" + +#include +#include +#include +#include + + +using namespace std; + +#include "db/database.hpp" +#include "db/db2stdout.h" +#include "oastatstruct.h" +#include "oss2db/struct2db.h" +#include "local.h" +#include "oss2db/kill2db.h" +#include "oss2db/init2db.h" +#include "oss2db/shutdown2db.h" +#include "oss2db/userinfo2db.h" +#include "oss2db/Disconnect2Db.h" + +string clientIdMap[MAX_ID]; + +static void processStdIn(); + +DB2stdout *db; + +vector commands; + +/** + * This function adds objects that are inherited from the Struct2Db class + * to the vector commands. + */ +void addCommands() +{ + //Add new commands here + commands.push_back(new Kill2Db()); + commands.push_back(new Init2Db()); + commands.push_back(new Shutdown2Db()); + commands.push_back(new Userinfo2Db()); + commands.push_back(new Disconnect2Db()); + //Add more commands just above here + + for(int i=0;isetDb(db); + } +} + +int main () +{ + cout << "INFO: oastat " << VERSION << " ready to process data" << endl; + db = new DB2stdout(); + + addCommands(); + + processStdIn(); + + /*while(true) { + string line; + cin >> line >> endl; + + }*/ + + return 0; + //Rest of file is for testing + + string line = " 3:33 Kill: 2 5 6: aaargh!!!!!!!!!!!!!! killed RALV by MOD_ROCKET"; + + OaStatStruct oss; + oss.parseLine(line); + + cout << "Time: '" << oss.second << "' command: '" << oss.command << "' restOfLine: '" << oss.restOfLine << "'" << endl; + + for (int i=0; isetDb(db); + + s2dp->process(oss); + + db->addKill(10, "DSAGOJSAOGFJWA55555555AGA", "AHFDSHDFBSDTRHSJYFDSGFA", 3); + + return 0; +} + +static void processStdIn() { + string line; + while( getline(cin,line) ) { + OaStatStruct oss; + oss.parseLine(line); + for(int i=0;iprocess(oss); + } + } +} + +/** + * Hashes the user id so they cannot be recovered from the db. + * param1 The unhashed id + * return the hashed id + */ +string getHashedId(string unhashedID) { + int msg_len = unhashedID.length(); + int hash_len = gcry_md_get_algo_dlen( GCRY_MD_SHA1 ); + unsigned char hash_binary[ hash_len ]; + char hash_hex[ hash_len*2+1 ]; + char *out = hash_hex; //(char *) malloc( sizeof(char) * ((hash_len*2)+1) ); + char *p = out; + + gcry_md_hash_buffer( GCRY_MD_SHA1, hash_binary, unhashedID.c_str(), msg_len ); + for ( int i = 0; i < hash_len; i++, p += 2 ) { + snprintf ( p, 3, "%02x", hash_binary[i] ); + } + + //free(out); + return unhashedID; //Replace with md5 at some point +} diff --git a/src/oastatstruct.cpp b/src/oastatstruct.cpp new file mode 100644 index 0000000..f80d920 --- /dev/null +++ b/src/oastatstruct.cpp @@ -0,0 +1,118 @@ +/* +=========================================================================== +oastat - OpenArena stat program +Copyright (C) 2010 Poul Sander (oastat@poulsander.com) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +=========================================================================== +*/ + +using namespace std; + +#include "oastatstruct.h" +#include +#include +#include + +OaStatStruct::OaStatStruct() { + second = 0; + command = ""; + parameters.empty(); + restOfLine = ""; +} + +OaStatStruct::OaStatStruct(const OaStatStruct& orig) { + second = orig.second; + command = orig.command; + parameters = orig.parameters; + restOfLine = orig.restOfLine; +} + +OaStatStruct::~OaStatStruct() { +} + +void OaStatStruct::parseLine(string line) { + //Parse time + //cout << line << endl; + //try{ + string tempTimeString = line.substr(0,7); + int posColon = tempTimeString.find(":"); + int minute = atoi(tempTimeString.substr(0,posColon).c_str()); + second = atoi(tempTimeString.substr(posColon+1,7).c_str()); + second+=minute*60; + line = line.substr(7,line.length()); //Cut the first part of the string. + + //Parse command name: + posColon = line.find(":"); + command = line.substr(0,posColon); + try{ + line = line.substr(posColon+2,line.length()); //Also remove the colon and the first space after it (+2) + + posColon = line.find_first_not_of(" -0123456789"); //First non-number or space + stringstream ss; + ss << line.substr(0,posColon); + int counter = 0; //to ensure that we don't go on forever + while(ss && counter++<10) { + int value; + ss >> value; + parameters.push_back(value); + } + + + if(line.at(posColon) == ':'){ + posColon++; //There is some inconsistensy about then there is a colon here + if(line.at(posColon) == ' ') + posColon++; //If there is a colon there is likely a space + } + line = line.substr(posColon,line.length()); + } catch(...) { + //The last part does not always exist... ignore it + restOfLine = ""; + return; + } + + + restOfLine = line; +} + +map OaStatStruct::GetInfostring(string restOfLine) { + map list; + int curPos = 0, lastPos = 0; + bool iskey = true; + string key, value; + if(restOfLine[0] == '\\') + lastPos++; + while(lastPos(key,value)); + if(key.length()>0) + list[key] = value; + //cout << key << ":" << value << endl; + } + iskey = !iskey; + lastPos = curPos+1; + } + return list; +} + +map OaStatStruct::GetInfostring() { + return GetInfostring(restOfLine); +} diff --git a/src/oastatstruct.h b/src/oastatstruct.h new file mode 100644 index 0000000..e286051 --- /dev/null +++ b/src/oastatstruct.h @@ -0,0 +1,49 @@ +/* + * File: oastatstruct.h + * Author: poul + * + * Created on 18. marts 2010, 19:10 + */ + +#ifndef _OASTATSTRUCT_H +#define _OASTATSTRUCT_H + +#include +#include +#include + +using namespace std; + +/* + * This is the most important class in oastat. This takes a line and stores all + * information from that line in easy to process parts. + */ +class OaStatStruct { +public: + OaStatStruct(); + OaStatStruct(const OaStatStruct& orig); + virtual ~OaStatStruct(); + + //There are no reason to make any variables private. + int second; //number of seconds + string command; //Like 'ClientConnect', 'Award' and 'Kill' + vector parameters; //The parameters for the command. + string restOfLine; + + void parseLine(string line); + + /* + *Parses the rest of the line to an info string + */ + map GetInfostring(string restOfLine); + + /* + *Same but uses this.restOfLine + */ + map GetInfostring(); +private: + +}; + +#endif /* _OASTATSTRUCT_H */ + diff --git a/src/oss2db/Disconnect2Db.cpp b/src/oss2db/Disconnect2Db.cpp new file mode 100644 index 0000000..6cfd711 --- /dev/null +++ b/src/oss2db/Disconnect2Db.cpp @@ -0,0 +1,30 @@ +/* + * File: Disconnect2Db.cpp + * Author: poul + * + * Created on 17. maj 2010, 21:13 + */ + +#include "Disconnect2Db.h" + +Disconnect2Db::Disconnect2Db() { +} + +Disconnect2Db::Disconnect2Db(const Disconnect2Db& orig) { +} + +Disconnect2Db::~Disconnect2Db() { +} + +string Disconnect2Db::getCommand() { + return "ClientDisconnect"; +} + +void Disconnect2Db::process(OaStatStruct oss) { + if(oss.command != getCommand() || oss.parameters.size()<1) + return; //Invalid oss + + string player = clientIdMap[oss.parameters.at(0)]; + + dp->setPlayerInfo(player,"",false,oss.second,-1,"","",-1); +} diff --git a/src/oss2db/Disconnect2Db.h b/src/oss2db/Disconnect2Db.h new file mode 100644 index 0000000..ce51604 --- /dev/null +++ b/src/oss2db/Disconnect2Db.h @@ -0,0 +1,28 @@ +/* + * File: Disconnect2Db.h + * Author: poul + * + * Created on 17. maj 2010, 21:13 + */ + +#ifndef _DISCONNECT2DB_H +#define _DISCONNECT2DB_H + +#include "struct2db.h" +#include "../local.h" + +class Disconnect2Db : public Struct2Db { +public: + Disconnect2Db(); + Disconnect2Db(const Disconnect2Db& orig); + virtual ~Disconnect2Db(); + + string getCommand(); + + void process(OaStatStruct oss); +private: + +}; + +#endif /* _DISCONNECT2DB_H */ + diff --git a/src/oss2db/init2db.cpp b/src/oss2db/init2db.cpp new file mode 100644 index 0000000..6fc70d6 --- /dev/null +++ b/src/oss2db/init2db.cpp @@ -0,0 +1,33 @@ +/* + * File: init2db.cpp + * Author: poul + * + * Created on 16. april 2010, 22:19 + */ + +#include "init2db.h" +#include + +Init2Db::Init2Db() { +} + +Init2Db::Init2Db(const Init2Db& orig) { +} + +Init2Db::~Init2Db() { +} + +string Init2Db::getCommand() { + return "InitGame"; +} + +void Init2Db::process(OaStatStruct oss) { + if(oss.command != getCommand()) + return; //Invalid oss + map arguments = oss.GetInfostring(); + int gametype = atoi(arguments["g_gametype"].c_str()); + string basegame = arguments["gamename"]; + string mapname = arguments["mapname"]; + + dp->startGame(gametype,mapname,basegame); +} diff --git a/src/oss2db/init2db.h b/src/oss2db/init2db.h new file mode 100644 index 0000000..fc5d542 --- /dev/null +++ b/src/oss2db/init2db.h @@ -0,0 +1,28 @@ +/* + * File: init2db.h + * Author: poul + * + * Created on 16. april 2010, 22:19 + */ + +#ifndef _INIT2DB_H +#define _INIT2DB_H + +#include "struct2db.h" +#include "../local.h" + +class Init2Db : public Struct2Db { +public: + Init2Db(); + Init2Db(const Init2Db& orig); + virtual ~Init2Db(); + + string getCommand(); + + void process(OaStatStruct oss); +private: + +}; + +#endif /* _INIT2DB_H */ + diff --git a/src/oss2db/kill2db.cpp b/src/oss2db/kill2db.cpp new file mode 100644 index 0000000..a91f7bf --- /dev/null +++ b/src/oss2db/kill2db.cpp @@ -0,0 +1,27 @@ + +#include + +#include "kill2db.h" + +string Kill2Db::getCommand() { + return "Kill"; +} + +void Kill2Db::process(OaStatStruct oss) { + if(oss.command != "Kill" || oss.parameters.size()<=3) + return; //Invalid oss + string target = ""; //Parameter 1 + string killer = ""; //Parameter 0 + //mod is parameter 2 + if(oss.parameters.at(1)>-1 && oss.parameters.at(1)-1 && oss.parameters.at(0)addKill(oss.second,killer,target,oss.parameters.at(2)); +} diff --git a/src/oss2db/kill2db.h b/src/oss2db/kill2db.h new file mode 100644 index 0000000..49c22f7 --- /dev/null +++ b/src/oss2db/kill2db.h @@ -0,0 +1,25 @@ +/* + * File: kill2db.h + * Author: poul + * + * Created on 21. marts 2010, 10:50 + */ + +#ifndef _KILL2DB_H +#define _KILL2DB_H + +#include "struct2db.h" +#include "../local.h" + +class Kill2Db : public Struct2Db { + + string getCommand(); + + void process(OaStatStruct oss); + +}; + + + +#endif /* _KILL2DB_H */ + diff --git a/src/oss2db/shutdown2db.cpp b/src/oss2db/shutdown2db.cpp new file mode 100644 index 0000000..f5a1488 --- /dev/null +++ b/src/oss2db/shutdown2db.cpp @@ -0,0 +1,28 @@ +/* + * File: shutdown2db.cpp + * Author: poul + * + * Created on 16. april 2010, 22:54 + */ + +#include "shutdown2db.h" + + +Shutdown2Db::Shutdown2Db() { +} + +Shutdown2Db::Shutdown2Db(const Shutdown2Db& orig) { +} + +Shutdown2Db::~Shutdown2Db() { +} + +string Shutdown2Db::getCommand() { + return "ShutdownGame"; +} + +void Shutdown2Db::process(OaStatStruct oss) { + if(oss.command != getCommand()) + return; + dp->endGame(oss.second); +} \ No newline at end of file diff --git a/src/oss2db/shutdown2db.h b/src/oss2db/shutdown2db.h new file mode 100644 index 0000000..4bc4b47 --- /dev/null +++ b/src/oss2db/shutdown2db.h @@ -0,0 +1,28 @@ +/* + * File: shutdown2db.h + * Author: poul + * + * Created on 16. april 2010, 22:54 + */ + +#ifndef _SHUTDOWN2DB_H +#define _SHUTDOWN2DB_H + +#include "struct2db.h" +#include "../local.h" + +class Shutdown2Db : public Struct2Db{ +public: + Shutdown2Db(); + Shutdown2Db(const Shutdown2Db& orig); + virtual ~Shutdown2Db(); + + string getCommand(); + + void process(OaStatStruct oss); +private: + +}; + +#endif /* _SHUTDOWN2DB_H */ + diff --git a/src/oss2db/struct2db.h b/src/oss2db/struct2db.h new file mode 100644 index 0000000..c041d5e --- /dev/null +++ b/src/oss2db/struct2db.h @@ -0,0 +1,47 @@ +/* + * File: struct2db.h + * Author: poul + * + * Created on 20. marts 2010, 18:04 + */ + +#ifndef _STRUCT2DB_H +#define _STRUCT2DB_H + +#include "../oastatstruct.h" +#include "../db/database.hpp" +#include + +using namespace std; + +/* + This is the struct to database class that all classes that interpret a log line must inherit + */ +class Struct2Db { + public: + /* + * The object will need a database interface to cummunicate to. This is given here + */ + void setDb(Database *d) { + dp = d; + } + + /* + * The object need a way to tell what command it is capreble to preocess. + * + * @returns The command the object can process + */ + virtual string getCommand() = 0; + + /* + * Parses s OaStatStruct to the object to process + */ + virtual void process(OaStatStruct oss) = 0; + + protected: + Database *dp; //Pointer to the used db +}; + + +#endif /* _STRUCT2DB_H */ + diff --git a/src/oss2db/userinfo2db.cpp b/src/oss2db/userinfo2db.cpp new file mode 100644 index 0000000..f054428 --- /dev/null +++ b/src/oss2db/userinfo2db.cpp @@ -0,0 +1,35 @@ +/* + * File: userinfo2db.cpp + * Author: poul + * + * Created on 16. april 2010, 23:08 + */ + +#include "userinfo2db.h" +#include + +Userinfo2Db::Userinfo2Db() { +} + +Userinfo2Db::Userinfo2Db(const Userinfo2Db& orig) { +} + +Userinfo2Db::~Userinfo2Db() { +} + +string Userinfo2Db::getCommand() { + return "ClientUserinfoChanged"; +} + +void Userinfo2Db::process(OaStatStruct oss) { + if(oss.command != getCommand() || oss.parameters.size()<1) + return; //Invalid oss + map arguments = oss.GetInfostring(); + + if(arguments["id"].length()>0) //Not bot + clientIdMap[oss.parameters.at(0)] = getHashedId(arguments["id"]); + else //bot + clientIdMap[oss.parameters.at(0)] = arguments["n"]; + + dp->setPlayerInfo(clientIdMap[oss.parameters.at(0)],arguments["n"],arguments["id"]=="",oss.second,atoi(arguments["t"].c_str()), arguments["model"],arguments["hmodel"]); +} diff --git a/src/oss2db/userinfo2db.h b/src/oss2db/userinfo2db.h new file mode 100644 index 0000000..fe25d63 --- /dev/null +++ b/src/oss2db/userinfo2db.h @@ -0,0 +1,42 @@ +/* +=========================================================================== +oastat - OpenArena stat program +Copyright (C) 2010 Poul Sander (oastat@poulsander.com) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +=========================================================================== +*/ + +#ifndef _USERINFO2DB_H +#define _USERINFO2DB_H + +#include "struct2db.h" +#include "../local.h" + +class Userinfo2Db : public Struct2Db{ +public: + Userinfo2Db(); + Userinfo2Db(const Userinfo2Db& orig); + virtual ~Userinfo2Db(); + + string getCommand(); + + void process(OaStatStruct oss); +private: + +}; + +#endif /* _USERINFO2DB_H */ +