Rockingcool/chat_application
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added code to retrieve sender (by calling the appropriate message_helper function), started refactoring code so that all data is processed in one shot, instead of waiting for multiple 'recv's

Browse Source
This commit is contained in:
Aadhavan Srinivasan
2023-04-11 08:09:27 -05:00
parent 3e07370f31
commit ace4e3c8e5
1 changed files with 57 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
main.c
View File

@@ -14,6 +14,7 @@
#define BUFFER_SIZE 10000 #define BUFFER_SIZE 10000
#define MAX_CONNECTIONS 100 #define MAX_CONNECTIONS 100
#define DATA_SIZE 50000
User** create_user_list(char* filename); User** create_user_list(char* filename);
void sigint_handler(int dummy); void sigint_handler(int dummy);
@@ -22,9 +23,10 @@ User* fetch_user(char* username);
User** users; User** users;
int num_users; int num_users;
bool stop_running = false; bool stop_running;
int main() { int main() {
stop_running = false;
signal(SIGINT,sigint_handler); signal(SIGINT,sigint_handler);
@@ -34,12 +36,14 @@ int main() {
fd_set read_fd_set; fd_set read_fd_set;
int conn_sockets[MAX_CONNECTIONS] = {-1}; int conn_sockets[MAX_CONNECTIONS] = {-1};
User* to_user[MAX_CONNECTIONS] = {NULL}; User* to_user[MAX_CONNECTIONS] = {NULL};
User* from_user[MAX_CONNECTIONS] = {NULL};
FD_ZERO(&read_fd_set); FD_ZERO(&read_fd_set);
char buffer[BUFFER_SIZE]; char buffer[BUFFER_SIZE];
char data[DATA_SIZE];
num_users = num_of_lines("user_file.txt"); num_users = num_of_lines("user_file.txt");
users = create_user_list("user_file.txt"); users = create_user_list("user_file.txt");
struct sockaddr addr_struct; struct sockaddr addr_struct;
int server_sock = create_local(4,'T',"127.0.0.1",30000,&addr_struct); int server_sock = create_local(4,'T',"127.0.0.1",30000,&addr_struct);
conn_sockets[0] = server_sock; conn_sockets[0] = server_sock;
@@ -69,43 +73,70 @@ int main() {
for (int i=1; i < MAX_CONNECTIONS; i++) { for (int i=1; i < MAX_CONNECTIONS; i++) {
if (FD_ISSET(conn_sockets[i],&read_fd_set)) { if (FD_ISSET(conn_sockets[i],&read_fd_set)) {
int num_bytes_read = recv(conn_sockets[i],buffer,sizeof(buffer),0); do {
if (num_bytes_read <= 0) {
close(conn_sockets[i]); while ( strcmp(buffer,"END_OF_DATA\r\n") != 0 ) {
conn_sockets[i] = 0; int num_bytes_read = recv(conn_sockets[i],buffer,sizeof(buffer),0);
to_user[i] = NULL; if (num_bytes_read <= 0) {
} else { close(conn_sockets[i]);
if (to_user[i] == NULL) { conn_sockets[i] = 0;
to_user[i] = fetch_user(fetch_dest_user_string(buffer)); to_user[i] = NULL;
GOTO continue_for_loop;
}
strcat(data, buffer);
}
strcat(data,"\0");
if (num_bytes_read <= 0) {
close(conn_sockets[i]);
conn_sockets[i] = 0;
to_user[i] = NULL;
break;
} else {
if (from_user[i] == NULL) {
from_user[i] = fetch_user(fetch_sender_user_string(buffer));
if (from_user[i] == NULL) {
printf("Please identify yourself.\n");
raise(SIGINT);
return 150;
} else {
printf("You are %s\n",from_user[i]->username);
}
continue;
}
if (to_user[i] == NULL) { if (to_user[i] == NULL) {
printf("Invalid message format or User\n"); to_user[i] = fetch_user(fetch_dest_user_string(buffer));
exit(241); if (to_user[i] == NULL) {
} else { printf("Invalid message format or User\n");
printf("Message intended for %s\n",to_user[i]->username); raise(SIGINT);
exit(0); } else {
printf("Message intended for %s\n",to_user[i]->username);
}
continue;
} }
char* message = fetch_message_string(buffer);
} }
// for (int i=0;i<num_bytes_read;i++) { } while (strcmp(buffer,"END_OF_DATA\r\n") != 0);
// printf("%c",buffer[i]);
// }
}
} }
continue_for_loop:
} }
} }
if (stop_running) { if (stop_running == true) {
for (int i=0; i< MAX_CONNECTIONS; i++) { printf("Stopping...\n");
for (int i=MAX_CONNECTIONS-1; i>= 0; i--) {
close(i);
close(conn_sockets[i]); close(conn_sockets[i]);
} }
exit(130); return 130;
} }