Changeset ca44f82 in network-game for server/DataAccess.cpp

Timestamp:

Feb 24, 2013, 1:28:32 AM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

7b43385

Parents:

3a79253 (diff), 8f85180 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Updated files to correctly compile on Windows

File:

• server/DataAccess.cpp (modified) (5 diffs)

server/DataAccess.cpp

@@ -3 +3 @@
 #include <iostream>
 #include <sstream>
+#include <cstdlib>
 
 using namespace std;
@@ -27 +28 @@
    ostringstream oss;
 
-   oss << "'" << username << "', '" << password << "'";
+   string salt = "$1$";
+   int random;
+   char chr;
+   for(int i=0; i<8; i++)
+   {
+      random = rand() % 62;
+      if (random < 26)
+         chr = (char)('a'+random);
+      else if (random < 52)
+         chr = (char)('A'+random-26);
+      else
+         chr = (char)('0'+random-52);
+      salt += chr;
+   }
+   salt += '$';
+
+   string encrypted(crypt(password.c_str(), salt.c_str()));
+
+   oss << "'" << username << "', '" << encrypted << "'";
 
    return insert("users", "name, password", oss.str());
+}
+
+int DataAccess::updatePlayer(string username, string password)
+{
+   ostringstream values, where;
+
+   values << "password='" << password << "'";
+   
+   where << "name='" << username << "'";
+
+   return update("users", values.str(), where.str());
 }
 
@@ -51 +81 @@
    }
 
-   if ( ( row = mysql_fetch_row(result)) != NULL )
+   if ( ( row = mysql_fetch_row(result)) != NULL ) {
+      cout << "Creating a new player" << endl;
       p = new Player(string(row[1]), string(row[2]));
-   else {
+   }else {
       cout << "Returned no results for some reason" << endl;
       p = NULL;
@@ -63 +94 @@
 }
 
-int DataAccess::printPlayers()
+// need to make sure this list is freed
+// since we need to create a DataAccess class
+// when calling these functions,
+// we could free this list in the destructor
+list<Player*>* DataAccess::getPlayers()
 {
    MYSQL_RES *result;
@@ -73 +108 @@
    if (result == NULL) {
       cout << mysql_error(connection) << endl;
-      return 1;
+      return NULL;
    }
 
+   list<Player*>* lstPlayers = new list<Player*>();
    while ( ( row = mysql_fetch_row(result)) != NULL ) {
       cout << row[0] << ", " << row[1] << ", " << row[2] << endl;
+      lstPlayers->push_back(new Player(row[1], row[2]));
    }
 
    mysql_free_result(result);
 
-   return 0;
+   return lstPlayers;
 }
 
-int DataAccess::insert(string table, string rows, string values)
+bool DataAccess::verifyPassword(string password, string encrypted)
+{
+   string test(crypt(password.c_str(), encrypted.c_str()));
+
+   return encrypted.compare(test) == 0;
+}
+
+int DataAccess::insert(string table, string columns, string values)
 {
    int query_state;
    ostringstream oss;
 
-   oss << "INSERT into " << table << " (" << rows << ") VALUES (" << values << ")";
+   oss << "INSERT into " << table << " (" << columns << ") VALUES (" << values << ")";
+   cout << "query: " << oss.str() << endl;
+
+   query_state = mysql_query(connection, oss.str().c_str());
+
+   if (query_state != 0) {
+      cout << mysql_error(connection) << endl;
+      return 1;
+   }
+
+   return 0;
+}
+
+int DataAccess::update(string table, string values, string where)
+{
+   int query_state;
+   ostringstream oss;
+
+   oss << "UPDATE " << table << " SET " << values << " WHERE " << where;
    cout << "query: " << oss.str() << endl;