forked from scott/threaded_network_chat
Compare commits
3 Commits
a9ed43b230
...
37d8b7fd0f
| Author | SHA1 | Date | |
|---|---|---|---|
| 37d8b7fd0f | |||
| e68d98a669 | |||
| ce5d66f712 |
@@ -3,7 +3,7 @@
|
||||
"UseTab": "Always",
|
||||
"IndentWidth": 8,
|
||||
"TabWidth": 8,
|
||||
"ColumnLimit": 120,
|
||||
"ColumnLimit": 100,
|
||||
"LineEnding": "LF",
|
||||
"RemoveBracesLLVM": true,
|
||||
"AlwaysBreakAfterReturnType": "AllDefinitions",
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
"UseTab": "Always",
|
||||
"IndentWidth": 8,
|
||||
"TabWidth": 8,
|
||||
"ColumnLimit": 120,
|
||||
"ColumnLimit": 100,
|
||||
"LineEnding": "LF",
|
||||
"RemoveBracesLLVM": true,
|
||||
"AlwaysBreakAfterReturnType": "AllDefinitions",
|
||||
|
||||
@@ -48,4 +48,3 @@ file_disp(std::string p, int lnstart, int lncount)
|
||||
refresh();
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
|
||||
#include "chat.h"
|
||||
|
||||
|
||||
int
|
||||
count_lines(std::string p)
|
||||
{
|
||||
@@ -40,4 +39,3 @@ log_append(std::string p, std::string ln)
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
16
src/main.cc
16
src/main.cc
@@ -58,11 +58,13 @@ main(int argc, char *argv[])
|
||||
switch (mode) {
|
||||
case CLIENT_MODE:
|
||||
log_append(log_path, "CLIENT MODE");
|
||||
client_start(listen_ip_address, listen_port, &socket_descriptor_client, log_path, &client_wait_thread);
|
||||
client_start(listen_ip_address, listen_port, &socket_descriptor_client, log_path,
|
||||
&client_wait_thread);
|
||||
break;
|
||||
case SERVER_MODE:
|
||||
log_append(log_path, "SERVER MODE");
|
||||
err = server_start(listen_port, &socket_descriptor_server, log_path, &client_wait_thread, &time_start);
|
||||
err = server_start(listen_port, &socket_descriptor_server, log_path,
|
||||
&client_wait_thread, &time_start);
|
||||
if (err)
|
||||
goto panic_no_server_sock;
|
||||
break;
|
||||
@@ -93,10 +95,12 @@ main(int argc, char *argv[])
|
||||
|
||||
switch (mode) {
|
||||
case CLIENT_MODE:
|
||||
client_stop(&time_start, &time_end, &socket_descriptor_client, &bytes_read, &bytes_written);
|
||||
client_stop(&time_start, &time_end, &socket_descriptor_client, &bytes_read,
|
||||
&bytes_written);
|
||||
break;
|
||||
case SERVER_MODE:
|
||||
server_stop(&time_start, &time_end, &socket_descriptor_server, &bytes_read, &bytes_written);
|
||||
server_stop(&time_start, &time_end, &socket_descriptor_server, &bytes_read,
|
||||
&bytes_written);
|
||||
break;
|
||||
default:
|
||||
goto panic_no_mode;
|
||||
@@ -117,7 +121,7 @@ panic_no_mode:
|
||||
|
||||
panic_no_server_sock:
|
||||
big_panic_msg();
|
||||
|
||||
|
||||
fprintf(stderr, "Fatal: Could not establish server socket!\n");
|
||||
return 1;
|
||||
}
|
||||
@@ -132,7 +136,7 @@ big_panic_msg(void)
|
||||
{
|
||||
if (!isendwin())
|
||||
endwin();
|
||||
|
||||
|
||||
fprintf(stderr, "-----FATAL ERROR, THIS SHOULD NEVER HAPPEN-----\n");
|
||||
usleep(400 * 1000);
|
||||
fprintf(stderr, "You may ask yourself... how do I work this?\n");
|
||||
|
||||
@@ -32,7 +32,8 @@ typedef struct __wserver_args_t {
|
||||
std::string log;
|
||||
} wserver_args_t;
|
||||
|
||||
/* client_start(listen_ip, listen_port, &socket_descriptor_client, log_path, &client_wait_thread); */
|
||||
/* client_start(listen_ip, listen_port, &socket_descriptor_client, log_path, &client_wait_thread);
|
||||
*/
|
||||
void
|
||||
client_start(std::string ip, int port, int *sock, std::string log, pthread_t *thr)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user