This commit is contained in:
2026-03-08 13:34:11 -05:00
parent 1368695e74
commit e5bb323a2f
4 changed files with 302 additions and 318 deletions

View File

@@ -2,13 +2,13 @@ CXX = g++
CXXFLAGS = -pthread -Wall -Wextra -O2 -std=c++17 CXXFLAGS = -pthread -Wall -Wextra -O2 -std=c++17
LDFLAGS = -lcurses LDFLAGS = -lcurses
TARGET = ct TARGET = ct
CXX_SRCS = main.cc chat.cc CXX_SRCS = main.cc
CXX_OBJS = $(CXX_SRCS:.cc=.o) CXX_OBJS = $(CXX_SRCS:.cc=.o)
all: $(TARGET) all: $(TARGET)
$(TARGET): $(CXX_OBJS) $(TARGET): $(CXX_OBJS)
$(CXX) $(CXXFLAGS) $(CXX_OBJS) -o $(TARGET) $(LDFLAGS) $(CXX) $(CXXFLAGS) $(LDFLAGS) $(CXX_OBJS) -o $(TARGET) $(LDFLAGS)
%.o: %.cc %.o: %.cc
$(CXX) $(CXXFLAGS) -c $< -o $@ $(CXX) $(CXXFLAGS) -c $< -o $@
@@ -16,5 +16,5 @@ $(TARGET): $(CXX_OBJS)
.PHONY: clean .PHONY: clean
clean: clean:
rm -f $(CXX_OBJS) $(TARGET) rm -f *.o $(TARGET)

273
chat.cc
View File

@@ -1,273 +0,0 @@
#include <algorithm>
#include <cstdio>
#include <fstream>
#include <iterator>
#include <netinet/in.h>
#include <pthread.h>
#include <arpa/inet.h>
#include <curses.h>
#include <netdb.h>
#include <string.h>
#include <sys/select.h>
#include <sys/socket.h>
#include <sys/time.h>
#include <unistd.h>
#include "chat.h"
void
clear_rows(int s, int e)
{
/* preserve cursor location */
int x_bef;
int y_bef;
getyx(stdscr, y_bef, x_bef);
for (int i = s; i < e; i++) {
move(i, 0);
clrtoeol();
}
move(y_bef, x_bef);
}
int
file_disp(std::string p, int lnstart, int lncount)
{
std::ifstream f(p);
if (!f)
return 1;
int i = 0;
int ln_no = 0;
std::string ln;
clear_rows(0, lncount + 1); /* clear chat window */
while (getline(f, ln) && i <= ln_no + lnstart + 1) {
if (i >= lnstart) {
move(ln_no, 0);
printw("%s", ln.c_str());
ln_no++;
}
i++;
}
move(CURSOR_DEFAULT_POSITION_Y, CURSOR_DEFAULT_POSITION_X);
refresh();
return 0;
}
int
count_lines(std::string p)
{
int c = 0;
std::ifstream f(p);
if (!f)
return c;
/* Apparently this is the most efficient way to count all lines in a file. How revolting! */
c = std::count(std::istreambuf_iterator<char>(f), std::istreambuf_iterator<char>(), '\n');
return c;
}
void *
await_client(void *a)
{
wclient_args_t *args = static_cast<wclient_args_t *>(a);
socket_descriptor_client = accept(socket_descriptor_server, (sockaddr *)&args->new_addr, &args->new_addr_siz);
if (socket_descriptor_client >= 0) {
log_append(log_path, "client connected");
if (count_lines(log_path) > LOG_LENGTH)
line_position++;
file_disp(log_path, line_position, LOG_LENGTH);
}
delete args;
return poll_client();
}
void *
poll_client(void)
{
char msg[1024];
for (;;) {
/* listen for msg from client */
memset(&msg, 0, sizeof(msg)); /* clear buf */
bytes_read += recv(socket_descriptor_client, (char *)&msg, sizeof(msg), 0);
log_append(log_path, msg);
if (count_lines(log_path) > LOG_LENGTH)
line_position++;
file_disp(log_path, line_position, LOG_LENGTH);
}
return nullptr;
}
void
server_start(int port)
{
auto *a = new wclient_args_t{};
sockaddr_in srv_addr;
sockaddr_in newsock;
socklen_t newsock_siz = sizeof(newsock);
int bstat;
int rc;
/* set up socket and connection tools */
bzero((char *)&srv_addr, sizeof(srv_addr));
srv_addr.sin_family = AF_INET;
srv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
srv_addr.sin_port = htons(port);
/* open stream-oriented socket w inet addr and track sock descriptor */
socket_descriptor_server = socket(AF_INET, SOCK_STREAM, 0);
if (socket_descriptor_server < 0)
goto panic_if_no_server_sock;
/* bind sock to its local addr */
bstat = bind(socket_descriptor_server, (struct sockaddr *)&srv_addr, sizeof(srv_addr));
if (bstat < 0)
goto panic_if_no_server_sock;
log_append(log_path, "Waiting for a client to connect...");
/* listen for up to 5 simultaneous requests */
listen(socket_descriptor_server, 5);
a->new_addr = newsock;
a->new_addr_siz = newsock_siz;
rc = pthread_create(&client_wait_thread, nullptr, await_client, a);
pthread_detach(client_wait_thread);
log_append(log_path, "Server started successfully.");
gettimeofday(&time_start, NULL);
return;
panic_if_no_server_sock:
endwin();
fprintf(stderr, "Fatal: Could not establish server socket!\n");
exit(1);
}
void
server_stop(void)
{
long e = time_end.tv_sec - time_start.tv_sec;
gettimeofday(&time_end, NULL);
close(socket_descriptor_server);
/* Don't just die silently */
puts("********Session********");
printf("Bytes written: %i\nBytes Read: %i\n", bytes_written, bytes_read);
printf("Elapsed time: %ld\n secs\n", e);
puts("Connection closed...");
}
void
client_stop(void)
{
long e = time_end.tv_sec - time_start.tv_sec;
gettimeofday(&time_end, NULL);
close(socket_descriptor_client);
puts("********Session********");
printf("Bytes written: %i\nBytes read: %i\n", bytes_written, bytes_read);
printf("Elapsed time: %ld\n secs\n", e);
puts("Connection closed...");
}
void *
poll_server(void *args)
{
wclient_args_t *a = static_cast<wclient_args_t *>(args);
int sock_desc = (int)a->aux;
char msg[1024];
for (;;) {
memset(&msg, 0, sizeof(msg));
bytes_read += recv(sock_desc, (char *)&msg, sizeof(msg), 0);
log_append(log_path, msg);
if (count_lines(log_path) > LOG_LENGTH)
line_position++;
file_disp(log_path, line_position, LOG_LENGTH);
}
}
void
client_start(void)
{
char msg[1024];
int bread;
int bwrit;
int rc;
sockaddr_in send_addr;
struct timeval time_start;
struct timeval time_end;
struct hostent *host = gethostbyname(listen_ip_address.c_str());
auto *a = new wclient_args_t{};
bzero((char *)&send_addr, sizeof(send_addr));
send_addr.sin_family = AF_INET;
send_addr.sin_addr.s_addr = inet_addr(inet_ntoa(*(struct in_addr *)*host->h_addr_list));
send_addr.sin_port = htons(listen_port);
socket_descriptor_client = socket(AF_INET, SOCK_STREAM, 0);
attempt_client_connection:
int stat = connect(socket_descriptor_client, (sockaddr *)&send_addr, sizeof(send_addr));
if (stat < 0) {
log_append(log_path, "Error connecting to socket, retrying...");
goto attempt_client_connection;
}
log_append(log_path, "Connected to the server!");
bread = bwrit = 0;
gettimeofday(&time_start, NULL);
a->aux = socket_descriptor_client;
rc = pthread_create(&client_wait_thread, nullptr, poll_server, a);
pthread_detach(client_wait_thread);
}
int
log_append(std::string p, std::string ln)
{
std::ofstream f;
f.open(p, std::ios_base::app);
if (!f.is_open())
return 1;
f << ln << std::endl;
f.close();
// "this probably would help but theres too much broken stuff right now to be sure" - scott
// bool inclnum should be added to function if we do decide to use this block:
//if (inclnum)
// line_position++;
return 0;
}

39
chat.h
View File

@@ -1,46 +1,7 @@
#ifndef CHAT_H #ifndef CHAT_H
#define CHAT_H #define CHAT_H
#ifndef _GLIBCXX_STRING
#include <string> #include <string>
#endif
#ifndef _NETINET_IN_H
#include <netinet/in.h>
#endif
typedef enum {
NO_MODE = 0,
SERVER_MODE = 1,
CLIENT_MODE = 2
} chatmode_t;
typedef struct {
sockaddr_in new_addr;
socklen_t new_addr_siz;
int aux;
}wclient_args_t;
const int CURSOR_DEFAULT_POSITION_X = 2;
const int CURSOR_DEFAULT_POSITION_Y = 12;
const int LOG_LENGTH = 10;
int line_position = 0;
struct timeval time_start;
struct timeval time_end;
int bytes_read;
int bytes_written;
int listen_port = 9999;
std::string listen_ip_address = "127.0.0.1";
std::string log_path;
int socket_descriptor_server;
int socket_descriptor_client;
pthread_t client_wait_thread;
void *await_client(void *a); void *await_client(void *a);
void clear_rows(int s, int e); void clear_rows(int s, int e);

302
main.cc
View File

@@ -1,16 +1,56 @@
#include <algorithm>
#include <cstdio>
#include <fstream>
#include <iterator>
#include <string> #include <string>
#include <arpa/inet.h>
#include <bits/types/struct_timeval.h> #include <bits/types/struct_timeval.h>
#include <curses.h> #include <curses.h>
#include <netdb.h>
#include <netinet/in.h>
#include <pthread.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/select.h>
#include <sys/socket.h>
#include <sys/time.h>
#include <unistd.h> #include <unistd.h>
#include "chat.h" #include "chat.h"
typedef enum { NO_MODE = 0, SERVER_MODE = 1, CLIENT_MODE = 2 } chatmode_t;
typedef struct {
sockaddr_in new_addr;
socklen_t new_addr_siz;
int aux;
} wclient_args_t;
chatmode_t mode = NO_MODE; chatmode_t mode = NO_MODE;
const int LOG_LENGTH = 10;
int line_position = 0;
const int CURSOR_DEFAULT_POSITION_X = 2;
const int CURSOR_DEFAULT_POSITION_Y = 12;
struct timeval time_start;
struct timeval time_end;
int bytes_read;
int bytes_written;
int listen_port = 9999;
std::string listen_ip_address = "127.0.0.1";
std::string log_path;
int socket_descriptor_server;
int socket_descriptor_client;
pthread_t client_wait_thread;
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
@@ -48,7 +88,7 @@ main(int argc, char *argv[])
line_position++; line_position++;
/* prompt for input */ /* prompt for input */
move(12, 0); move(CURSOR_DEFAULT_POSITION_Y, 0);
printw("> "); printw("> ");
/* await input */ /* await input */
@@ -60,7 +100,7 @@ main(int argc, char *argv[])
/* Final exit point if everything goes OK */ /* Final exit point if everything goes OK */
endwin(); endwin();
switch (mode) { switch (mode) {
case CLIENT_MODE: case CLIENT_MODE:
client_stop(); client_stop();
@@ -72,7 +112,7 @@ main(int argc, char *argv[])
goto panic_no_mode; goto panic_no_mode;
break; break;
} }
return 0; return 0;
panic_no_mode: panic_no_mode:
@@ -88,3 +128,259 @@ panic_no_mode:
return 1; return 1;
} }
void
clear_rows(int s, int e)
{
/* preserve cursor location */
int x_bef;
int y_bef;
getyx(stdscr, y_bef, x_bef);
for (int i = s; i < e; i++) {
move(i, 0);
clrtoeol();
}
move(y_bef, x_bef);
}
int
file_disp(std::string p, int lnstart, int lncount)
{
std::ifstream f(p);
if (!f)
return 1;
int i = 0;
int ln_no = 0;
std::string ln;
clear_rows(0, lncount + 1); /* clear chat window */
while (getline(f, ln) && i <= ln_no + lnstart + 1) {
if (i >= lnstart) {
move(ln_no, 0);
printw("%s", ln.c_str());
ln_no++;
}
i++;
}
move(CURSOR_DEFAULT_POSITION_Y, CURSOR_DEFAULT_POSITION_X);
refresh();
return 0;
}
int
count_lines(std::string p)
{
int c = 0;
std::ifstream f(p);
if (!f)
return c;
/* Apparently this is the most efficient way to count all lines in a file. How revolting! */
c = std::count(std::istreambuf_iterator<char>(f), std::istreambuf_iterator<char>(), '\n');
return c;
}
void *
await_client(void *a)
{
wclient_args_t *args = static_cast<wclient_args_t *>(a);
socket_descriptor_client = accept(socket_descriptor_server, (sockaddr *)&args->new_addr, &args->new_addr_siz);
if (socket_descriptor_client >= 0) {
log_append(log_path, "client connected");
if (count_lines(log_path) > LOG_LENGTH)
line_position++;
file_disp(log_path, line_position, LOG_LENGTH);
}
delete args;
return poll_client();
}
void *
poll_client(void)
{
char msg[1024];
for (;;) {
/* listen for msg from client */
memset(&msg, 0, sizeof(msg)); /* clear buf */
bytes_read += recv(socket_descriptor_client, (char *)&msg, sizeof(msg), 0);
log_append(log_path, msg);
if (count_lines(log_path) > LOG_LENGTH)
line_position++;
file_disp(log_path, line_position, LOG_LENGTH);
}
return nullptr;
}
void
server_start(int port)
{
auto *a = new wclient_args_t{};
sockaddr_in srv_addr;
sockaddr_in newsock;
socklen_t newsock_siz = sizeof(newsock);
int bstat;
int rc;
/* set up socket and connection tools */
bzero((char *)&srv_addr, sizeof(srv_addr));
srv_addr.sin_family = AF_INET;
srv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
srv_addr.sin_port = htons(port);
/* open stream-oriented socket w inet addr and track sock descriptor */
socket_descriptor_server = socket(AF_INET, SOCK_STREAM, 0);
if (socket_descriptor_server < 0)
goto panic_if_no_server_sock;
/* bind sock to its local addr */
bstat = bind(socket_descriptor_server, (struct sockaddr *)&srv_addr, sizeof(srv_addr));
if (bstat < 0)
goto panic_if_no_server_sock;
log_append(log_path, "Waiting for a client to connect...");
/* listen for up to 5 simultaneous requests */
listen(socket_descriptor_server, 5);
a->new_addr = newsock;
a->new_addr_siz = newsock_siz;
rc = pthread_create(&client_wait_thread, nullptr, await_client, a);
pthread_detach(client_wait_thread);
log_append(log_path, "Server started successfully.");
gettimeofday(&time_start, NULL);
return;
panic_if_no_server_sock:
endwin();
fprintf(stderr, "Fatal: Could not establish server socket!\n");
exit(1);
}
void
server_stop(void)
{
long e = time_end.tv_sec - time_start.tv_sec;
gettimeofday(&time_end, NULL);
close(socket_descriptor_server);
/* Don't just die silently */
puts("********Session********");
printf("Bytes written: %i\nBytes Read: %i\n", bytes_written, bytes_read);
printf("Elapsed time: %ld\n secs\n", e);
puts("Connection closed...");
}
void
client_stop(void)
{
long e = time_end.tv_sec - time_start.tv_sec;
gettimeofday(&time_end, NULL);
close(socket_descriptor_client);
puts("********Session********");
printf("Bytes written: %i\nBytes read: %i\n", bytes_written, bytes_read);
printf("Elapsed time: %ld\n secs\n", e);
puts("Connection closed...");
}
void *
poll_server(void *args)
{
wclient_args_t *a = static_cast<wclient_args_t *>(args);
int sock_desc = (int)a->aux;
char msg[1024];
for (;;) {
memset(&msg, 0, sizeof(msg));
bytes_read += recv(sock_desc, (char *)&msg, sizeof(msg), 0);
log_append(log_path, msg);
if (count_lines(log_path) > LOG_LENGTH)
line_position++;
file_disp(log_path, line_position, LOG_LENGTH);
}
}
void
client_start(void)
{
char msg[1024];
int bread;
int bwrit;
int rc;
sockaddr_in send_addr;
struct timeval time_start;
struct timeval time_end;
struct hostent *host = gethostbyname(listen_ip_address.c_str());
auto *a = new wclient_args_t{};
bzero((char *)&send_addr, sizeof(send_addr));
send_addr.sin_family = AF_INET;
send_addr.sin_addr.s_addr = inet_addr(inet_ntoa(*(struct in_addr *)*host->h_addr_list));
send_addr.sin_port = htons(listen_port);
socket_descriptor_client = socket(AF_INET, SOCK_STREAM, 0);
attempt_client_connection:
int stat = connect(socket_descriptor_client, (sockaddr *)&send_addr, sizeof(send_addr));
if (stat < 0) {
log_append(log_path, "Error connecting to socket, retrying...");
goto attempt_client_connection;
}
log_append(log_path, "Connected to the server!");
bread = bwrit = 0;
gettimeofday(&time_start, NULL);
a->aux = socket_descriptor_client;
rc = pthread_create(&client_wait_thread, nullptr, poll_server, a);
pthread_detach(client_wait_thread);
}
int
log_append(std::string p, std::string ln)
{
std::ofstream f;
f.open(p, std::ios_base::app);
if (!f.is_open())
return 1;
f << ln << std::endl;
f.close();
// "this probably would help but theres too much broken stuff right now to be sure" - scott
// bool inclnum should be added to function if we do decide to use this block:
// if (inclnum)
// line_position++;
return 0;
}