jazz/threaded_network_chat
1
0
Fork 0
forked from scott/threaded_network_chat
Code Pull Requests Activity

express mode as enum, fix some display issues, use switch for mode checks

Browse Source
This commit is contained in:
jazz
2026-03-19 22:44:29 -05:00
parent f947992b61
commit be5e928369
2 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
main.cc
View File

@@ -5,7 +5,6 @@
#include <pthread.h> #include <pthread.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <string>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/types.h> #include <sys/types.h>
@@ -13,6 +12,7 @@
#include <sys/wait.h> #include <sys/wait.h>
#include <unistd.h> #include <unistd.h>
#include <string>
#include <vector> //try to make the program work without this without doing anything awful but do it later #include <vector> //try to make the program work without this without doing anything awful but do it later
#include "client.h" #include "client.h"
@@ -30,7 +30,8 @@ const int DEFAULT_CUR_X = 2; // the x position of the preferred default cursor
const int DEFAULT_CUR_Y = 12; // the x position of the preferred default cursor const int DEFAULT_CUR_Y = 12; // the x position of the preferred default cursor
// position for message entry // position for message entry
int mode = 0; // what mode is this program in. 0 = nothing. 1 = server. 2 = client chatmode_t mode = NO_MODE; // what mode is this program in. 0 = nothing. 1 = server. 2 = client
int serverSocketDescriptor; // a global variable for storing the server socket int serverSocketDescriptor; // a global variable for storing the server socket
// descriptor. // descriptor.
int clientSocketDescriptor; int clientSocketDescriptor;
@@ -60,14 +61,12 @@ struct waitClientArgs {
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
if (argc > 1 && argv[1][0] == 'c') { if (argc > 1 && (!strncmp(argv[1], "client", 6))) {
// client mode
logFileName = "client.txt"; logFileName = "client.txt";
mode = 2; mode = CLIENT_MODE;
} else { } else {
// server mode
logFileName = "server.txt"; logFileName = "server.txt";
mode = 1; mode = SERVER_MODE;
} }
// putting this lower down to circumvent the terminal brick when the // putting this lower down to circumvent the terminal brick when the
@@ -87,13 +86,20 @@ main(int argc, char *argv[])
char *userInput = new char[1024]; char *userInput = new char[1024];
bool exit = false; bool exit = false;
if (mode == 2) { switch (mode) {
case CLIENT_MODE:
writeToFile(logFileName, "CLIENT MODE"); writeToFile(logFileName, "CLIENT MODE");
setupClient(); setupClient();
} else if (mode == 1) { linePos++;
break;
case SERVER_MODE:
writeToFile(logFileName, "SERVER MODE"); writeToFile(logFileName, "SERVER MODE");
setupServer(PORT_NUM); setupServer(PORT_NUM);
linePos++; /* No idea why, but this needs to be here. */ linePos++;
break;
default:
goto leave;
break;
} }
while (!exit) { while (!exit) {
@@ -107,7 +113,7 @@ main(int argc, char *argv[])
/* clear message box / reset cursor */ /* clear message box / reset cursor */
move(12, 0); move(12, 0);
printw(">\t\t\t"); printw(">\t\t\t");
move(12,2); move(12, 2);
getstr(userInput); getstr(userInput);
writeToFile(logFileName, userInput); writeToFile(logFileName, userInput);
@@ -121,13 +127,23 @@ main(int argc, char *argv[])
send(clientSocketDescriptor, (char *)userInput, strlen(userInput), 0); send(clientSocketDescriptor, (char *)userInput, strlen(userInput), 0);
} }
leave:
endwin(); endwin();
//closeServer(); // closeServer();
if (mode == 1) switch (mode) {
case SERVER_MODE:
closeServer(); closeServer();
else if (mode == 2) break;
closeClient(); case CLIENT_MODE:
closeServer();
break;
default:
puts("Warn: program appears to have successfully finished without ever setting "
"mode.");
return 1;
break;
}
return 0; return 0;
} }

4
public.h
View File

@@ -5,11 +5,13 @@
using namespace std; using namespace std;
typedef enum { NO_MODE = 0, SERVER_MODE = 1, CLIENT_MODE = 2 } chatmode_t;
extern chatmode_t mode;
extern const int PORT_NUM; extern const int PORT_NUM;
extern string IP_ADDRESS; extern string IP_ADDRESS;
extern const int DEFAULT_CUR_X; extern const int DEFAULT_CUR_X;
extern const int DEFAULT_CUR_Y; extern const int DEFAULT_CUR_Y;
extern int mode;
extern int serverSocketDescriptor; extern int serverSocketDescriptor;
extern int clientSocketDescriptor; extern int clientSocketDescriptor;
extern struct timeval start1, end1; extern struct timeval start1, end1;