Changeset c941e07 in network-game

Timestamp:

Nov 11, 2014, 1:05:14 AM (10 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

master

Children:

48801af

Parents:

a9a1295

Message:

Only load the db settings once and actually use the loaded settings instead of the hard-coded ones

Location:

server

Files:

• DataAccess.cpp (modified) (1 diff)
• server.cpp (modified) (3 diffs)

server/DataAccess.cpp

@@ -31 +31 @@
 
    mysql_init(&mysql);
-   connection = mysql_real_connect(&mysql, "localhost", "pythonAdmin", "pyMaster09*", "pythondb", 0, 0, 0);
+   connection = mysql_real_connect(&mysql, "localhost", username.c_str(), password.c_str(), database.c_str(), 0, 0, 0);
 
    if (connection == NULL) {

server/server.cpp

@@ -43 +43 @@
 // from used to be const. Removed that so I could take a reference
 // and use it to send messages
-void processMessage(const NETWORK_MSG& clientMsg, struct sockaddr_in& from, MessageProcessor& msgProcessor, map<unsigned int, Player*>& mapPlayers, map<string, Game*>& mapGames, ofstream& outputLog);
+void processMessage(const NETWORK_MSG& clientMsg, struct sockaddr_in& from, MessageProcessor& msgProcessor, map<unsigned int, Player*>& mapPlayers, map<string, Game*>& mapGames, DataAccess& da, ofstream& outputLog);
 
 Player *findPlayerByName(map<unsigned int, Player*> &m, string name);
@@ -256 +256 @@
       if (msgProcessor.receiveMessage(&clientMsg, &from) >= 0)
       {
-         processMessage(clientMsg, from, msgProcessor, mapPlayers, mapGames, outputLog);
+         processMessage(clientMsg, from, msgProcessor, mapPlayers, mapGames, da, outputLog);
 
          cout << "Finished processing the message" << endl;
@@ -281 +281 @@
 }
 
-void processMessage(const NETWORK_MSG &clientMsg, struct sockaddr_in &from, MessageProcessor &msgProcessor, map<unsigned int, Player*>& mapPlayers, map<string, Game*>& mapGames, ofstream& outputLog)
+void processMessage(const NETWORK_MSG &clientMsg, struct sockaddr_in &from, MessageProcessor &msgProcessor, map<unsigned int, Player*>& mapPlayers, map<string, Game*>& mapGames, DataAccess& da, ofstream& outputLog)
 {
    NETWORK_MSG serverMsg;
-   DataAccess da;
 
    cout << "Inside processMessage" << endl;