Changes in server/server.cpp [3b1efcc:b53c6b3] in network-game

File:

• server/server.cpp (modified) (12 diffs)

server/server.cpp

@@ -4 +4 @@
 #include <string>
 #include <iostream>
-#include <sstream>
 #include <vector>
 #include <algorithm>
@@ -22 +21 @@
 #include "../common/Compiler.h"
 #include "../common/Message.h"
-#include "../common/Common.h"
 
 #include "Player.h"
@@ -29 +27 @@
 using namespace std;
 
-bool processMessage(const NETWORK_MSG &clientMsg, const struct sockaddr_in &from, vector<Player> &vctPlayers, NETWORK_MSG &serverMsg);
+void processMessage(const NETWORK_MSG &clientMsg, const struct sockaddr_in &from, vector<Player> &vctPlayers, int &num, NETWORK_MSG &serverMsg);
 
 // this should probably go somewhere in the common folder
@@ -65 +63 @@
 }
 
+void set_nonblock(int sock)
+{
+    int flags;
+    flags = fcntl(sock, F_GETFL,0);
+    assert(flags != -1);
+    fcntl(sock, F_SETFL, flags | O_NONBLOCK);
+}
+
 int main(int argc, char *argv[])
 {
    int sock, length, n;
    struct sockaddr_in server;
-   struct sockaddr_in from; // info of client sending the message
+   struct sockaddr_in from; // holds the info about the connected client
    NETWORK_MSG clientMsg, serverMsg;
    vector<Player> vctPlayers;
+
+   srand(time(NULL));
+   int num = (rand() % 1000) + 1;
+
+   cout << "num: " << num << endl;
 
    SSL_load_error_strings();
@@ -94 +105 @@
    set_nonblock(sock);
 
-   bool broadcastMessage;
    while (true) {
 
@@ -104 +114 @@
          cout << "Got a message" << endl;
 
-         broadcastMessage = processMessage(clientMsg, from, vctPlayers, serverMsg);
+         processMessage(clientMsg, from, vctPlayers, num, serverMsg);
 
          cout << "msg: " << serverMsg.buffer << endl;
 
-         if (broadcastMessage)
-         {
-            vector<Player>::iterator it;
-
-            for (it = vctPlayers.begin(); it != vctPlayers.end(); it++)
-            {
-               if ( sendMessage(&serverMsg, sock, &(it->addr)) < 0 )
-                  error("sendMessage");
-            }
-         }
-         else
-         {
-            if ( sendMessage(&serverMsg, sock, &from) < 0 )
-               error("sendMessage");
-         }
+         n = sendMessage(&serverMsg, sock, &from);
+         if (n  < 0)
+            error("sendMessage");
       }
 
@@ -130 +128 @@
 }
 
-bool processMessage(const NETWORK_MSG &clientMsg, const struct sockaddr_in &from, vector<Player> &vctPlayers, NETWORK_MSG &serverMsg)
+void processMessage(const NETWORK_MSG &clientMsg, const struct sockaddr_in &from, vector<Player> &vctPlayers, int &num, NETWORK_MSG &serverMsg)
 {
    DataAccess da;
@@ -138 +136 @@
    cout << "MSG: type: " << clientMsg.type << endl;
    cout << "MSG contents: " << clientMsg.buffer << endl;
-
-   bool broadcastResponse = false;
 
    // Check that if an invalid message is sent, the client will correctly
@@ -153 +149 @@
          cout << "password: " << password << endl;
 
-         int error = da.insertPlayer(username, password);
-
-         if (!error)
-            strcpy(serverMsg.buffer, "Registration successful.");
-         else
-            strcpy(serverMsg.buffer, "Registration failed. Please try again.");
+         da.insertPlayer(username, password);
+
+         strcpy(serverMsg.buffer, "Registration successful");
 
          serverMsg.type = MSG_TYPE_REGISTER;
@@ -186 +179 @@
 
             vctPlayers.push_back(newP);
-            strcpy(serverMsg.buffer, "Login successful. Enjoy chatting with outher players.");
+            strcpy(serverMsg.buffer, "I'm thinking of a number between 1 and 1000. Guess what it is.");
          }
 
@@ -229 +222 @@
          else
          {
-            broadcastResponse = true;
-
-            stringstream ss;
-            ss << p->name << ": " << clientMsg.buffer << endl;
-
-            strcpy(serverMsg.buffer, ss.str().c_str());
+            int guess = atoi(clientMsg.buffer);
+
+            cout << "guess: " << guess << endl;
+
+            if (guess < 1 || guess > 1000) {
+               strcpy(serverMsg.buffer, "You must guess a number between 1 and 1000");
+            }else if(guess > num)
+               strcpy(serverMsg.buffer, "The number I'm thinking of is less than that.");
+            else if(guess < num)
+               strcpy(serverMsg.buffer, "The number I'm thinking of is greater than that.");
+            else if(guess == num) {
+               strcpy(serverMsg.buffer, "Congratulations! I will now think of a new number.");
+               num = (rand() % 1000) + 1;
+            }
          }      
 
@@ -249 +250 @@
          break;
       }
-
-      return broadcastResponse;
-   }
-}
+   }
+}