Changeset 3b1efcc in network-game

Timestamp:

Dec 9, 2012, 4:38:38 PM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

581058c

Parents:

b53c6b3

Message:

The server sends back an error on failed registration and sends chat messages to all players, not just the sender. The non-blocking socket function was moved to a new file in the common folder so the client can use it.

Files:

• client/Client/main.cpp (modified) (1 diff)
• common/Common.h (added)
• server/server.cpp (modified) (12 diffs)

client/Client/main.cpp

@@ -360 +360 @@
    string response = string(msg.buffer);
 
-   // this whole select block should go in a new function.
-   // Figure out how to pass and return params properly
    switch(state)
    {

server/server.cpp

@@ -4 +4 @@
 #include <string>
 #include <iostream>
+#include <sstream>
 #include <vector>
 #include <algorithm>
@@ -21 +22 @@
 #include "../common/Compiler.h"
 #include "../common/Message.h"
+#include "../common/Common.h"
 
 #include "Player.h"
@@ -27 +29 @@
 using namespace std;
 
-void processMessage(const NETWORK_MSG &clientMsg, const struct sockaddr_in &from, vector<Player> &vctPlayers, int &num, NETWORK_MSG &serverMsg);
+bool processMessage(const NETWORK_MSG &clientMsg, const struct sockaddr_in &from, vector<Player> &vctPlayers, NETWORK_MSG &serverMsg);
 
 // this should probably go somewhere in the common folder
@@ -63 +65 @@
 }
 
-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; // holds the info about the connected client
+   struct sockaddr_in from; // info of client sending the message
    NETWORK_MSG clientMsg, serverMsg;
    vector<Player> vctPlayers;
-
-   srand(time(NULL));
-   int num = (rand() % 1000) + 1;
-
-   cout << "num: " << num << endl;
 
    SSL_load_error_strings();
@@ -105 +94 @@
    set_nonblock(sock);
 
+   bool broadcastMessage;
    while (true) {
 
@@ -114 +104 @@
          cout << "Got a message" << endl;
 
-         processMessage(clientMsg, from, vctPlayers, num, serverMsg);
+         broadcastMessage = processMessage(clientMsg, from, vctPlayers, serverMsg);
 
          cout << "msg: " << serverMsg.buffer << endl;
 
-         n = sendMessage(&serverMsg, sock, &from);
-         if (n  < 0)
-            error("sendMessage");
+         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");
+         }
       }
 
@@ -128 +130 @@
 }
 
-void processMessage(const NETWORK_MSG &clientMsg, const struct sockaddr_in &from, vector<Player> &vctPlayers, int &num, NETWORK_MSG &serverMsg)
+bool processMessage(const NETWORK_MSG &clientMsg, const struct sockaddr_in &from, vector<Player> &vctPlayers, NETWORK_MSG &serverMsg)
 {
    DataAccess da;
@@ -136 +138 @@
    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
@@ -149 +153 @@
          cout << "password: " << password << endl;
 
-         da.insertPlayer(username, password);
-
-         strcpy(serverMsg.buffer, "Registration successful");
+         int error = da.insertPlayer(username, password);
+
+         if (!error)
+            strcpy(serverMsg.buffer, "Registration successful.");
+         else
+            strcpy(serverMsg.buffer, "Registration failed. Please try again.");
 
          serverMsg.type = MSG_TYPE_REGISTER;
@@ -179 +186 @@
 
             vctPlayers.push_back(newP);
-            strcpy(serverMsg.buffer, "I'm thinking of a number between 1 and 1000. Guess what it is.");
+            strcpy(serverMsg.buffer, "Login successful. Enjoy chatting with outher players.");
          }
 
@@ -222 +229 @@
          else
          {
-            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;
-            }
+            broadcastResponse = true;
+
+            stringstream ss;
+            ss << p->name << ": " << clientMsg.buffer << endl;
+
+            strcpy(serverMsg.buffer, ss.str().c_str());
          }      
 
@@ -250 +249 @@
          break;
       }
-   }
-}
+
+      return broadcastResponse;
+   }
+}