danemacfadden/chatty
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge fix

Browse Source
This commit is contained in:
Dane MacFadden
2025-08-05 16:43:40 -06:00
parent 23fd0d85a1
commit 3e408b903f
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main.c
+11 -5
View File
@@ -44,15 +44,17 @@ void *sender(void *arg) {
while (1) { while (1) {
pthread_mutex_lock(&sendmut); pthread_mutex_lock(&sendmut);
if (ListCount(sendlist) != 0) { if (ListCount(sendlist) != 0) {
printf("The size of sendlist is %d\n", sendlist->size);
ListFirst(sendlist); ListFirst(sendlist);
strcpy(msg, ListCurr(sendlist)); strcpy(msg, ListCurr(sendlist));
send(sockfd, "test", 4, 0);
ListRemove(sendlist); ListRemove(sendlist);
} }
else { else {
pthread_mutex_unlock(&sendmut); pthread_mutex_unlock(&sendmut);
continue; continue;
} }
pthread_mutex_unlock(&sendmut); pthread_mutex_unlock(&sendmut);
} }
return 0; return 0;
} }
@@ -61,7 +63,8 @@ void *receiver(void *arg) {
char msg[30]; char msg[30];
char *copy = malloc(31); char *copy = malloc(31);
while (1) { while (1) {
recv(sockfd, msg, 30, 0); recv(sockfd, msg, 4, 0);
printf("Message: \"%s\"\n", msg);
if (msg[0] != '\n' && msg[0] != '\0') { if (msg[0] != '\n' && msg[0] != '\0') {
pthread_mutex_lock(&receivemut); pthread_mutex_lock(&receivemut);
ListAppend(receivelist, msg); ListAppend(receivelist, msg);
@@ -79,7 +82,7 @@ void *output(void *arg) {
ListFirst(receivelist); ListFirst(receivelist);
msg = ListCurr(receivelist); msg = ListCurr(receivelist);
ListRemove(receivelist); ListRemove(receivelist);
printf("%s\n", (char*)msg); printf("Message: %s\n", (char*)msg);
} }
pthread_mutex_unlock(&receivemut); pthread_mutex_unlock(&receivemut);
} }
@@ -106,7 +109,7 @@ int main(int argc, char* argv[]) {
char *remote_machine, *local_port, *remote_port; char *remote_machine, *local_port, *remote_port;
int status; int status;
int yes = 1; int yes = 1;
char buf[4] = "test";
if (argc != 4) { if (argc != 4) {
printf("Wrong number of arguments. Usage: ./chatty <local port> \ printf("Wrong number of arguments. Usage: ./chatty <local port> \
<remote IP> <remote port>\n"); <remote IP> <remote port>\n");
@@ -224,7 +227,7 @@ int main(int argc, char* argv[]) {
} }
printf("Connected!\n"); printf("Connected!\n");
} }
pthread_create(&input_thread, NULL, input, NULL); /* pthread_create(&input_thread, NULL, input, NULL);
pthread_create(&send_thread, NULL, sender, NULL); pthread_create(&send_thread, NULL, sender, NULL);
pthread_create(&receive_thread, NULL, receiver, NULL); pthread_create(&receive_thread, NULL, receiver, NULL);
pthread_create(&output_thread, NULL, output, NULL); pthread_create(&output_thread, NULL, output, NULL);
@@ -232,7 +235,10 @@ int main(int argc, char* argv[]) {
pthread_join(send_thread, NULL); pthread_join(send_thread, NULL);
pthread_join(receive_thread, NULL); pthread_join(receive_thread, NULL);
pthread_join(output_thread, NULL); pthread_join(output_thread, NULL);
*/
send(sockfd, buf, 4, 0);
printf("Sent\n");
close(sockfd); close(sockfd);
close(confd); close(confd);
return 0; return 0;