From 63bd78aeb0a50d9b6588246194129b3c2fd64c48 Mon Sep 17 00:00:00 2001 From: "Simon V. Lejel" Date: Sat, 10 Feb 2024 14:24:15 +0100 Subject: [PATCH 1/5] =?UTF-8?q?=E2=9C=A8=20Make=20server=20continous?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/main.cc | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/server/main.cc b/src/server/main.cc index 873c41f..1232f6c 100644 --- a/src/server/main.cc +++ b/src/server/main.cc @@ -1,6 +1,7 @@ #include #include #include +#include #include #include @@ -8,12 +9,7 @@ using std::cout, std::endl, std::string; int main() { - struct Message { - string content; - string username; - }; - - cout << "Initializing server"; + cout << "Initializing server" << endl; int serverSocket = socket(AF_INET, SOCK_STREAM, 0); if (serverSocket == -1) { // TODO error @@ -40,9 +36,11 @@ int main() { // TODO error } - char buffer[1024] = { 0 }; - recv(clientSocket, buffer, sizeof(buffer), 0); - cout << "Message from client " << buffer << endl; + while (true) { + char buffer[1024] = {0}; + recv(clientSocket, buffer, sizeof(buffer), 0); + cout << buffer << endl; + } close(serverSocket); From 9b2706ed812b164ece72d88c12451977db73a7ec Mon Sep 17 00:00:00 2001 From: "Simon V. Lejel" Date: Sat, 10 Feb 2024 14:25:24 +0100 Subject: [PATCH 2/5] =?UTF-8?q?=E2=9C=A8=20Add=20toString=20to=20Messages?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/client/main.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/client/main.cc b/src/client/main.cc index 552bf17..6cb56da 100644 --- a/src/client/main.cc +++ b/src/client/main.cc @@ -10,8 +10,12 @@ using std::cout, std::cin, std::endl, std::string; int main() { struct Message { - char * content; + string content; string username; + + string toString() { + return "User '" + username + "' wrote:\n" + content; + } }; int clientSocket = socket(AF_INET, SOCK_STREAM, 0); From 2a5a735fde0d34653728b2c85c0d14d0fa39565f Mon Sep 17 00:00:00 2001 From: "Simon V. Lejel" Date: Sat, 10 Feb 2024 14:25:45 +0100 Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=90=9B=20Fix=20client=20not=20connect?= =?UTF-8?q?ing?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/client/main.cc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/client/main.cc b/src/client/main.cc index 6cb56da..9ef0cb8 100644 --- a/src/client/main.cc +++ b/src/client/main.cc @@ -25,6 +25,15 @@ int main() { serverAdress.sin_port = htons(8080); serverAdress.sin_addr.s_addr = inet_addr("127.0.0.50"); + int connectStatus = connect(clientSocket, (struct sockaddr *)&serverAdress, + sizeof(serverAdress)); + if (connectStatus != 0) { + cout << "Failed to connect"; + return connectStatus; + } else { + cout << "CONNECTED!" << endl; + } + while (true) { Message message; cout << "Type message to server: "; From 45e779c56f404e03bf04b05808e2fd139091db50 Mon Sep 17 00:00:00 2001 From: "Simon V. Lejel" Date: Sat, 10 Feb 2024 14:26:45 +0100 Subject: [PATCH 4/5] =?UTF-8?q?=F0=9F=8E=A8=20Impore=20formatting=20of=20o?= =?UTF-8?q?utput?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/client/main.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/client/main.cc b/src/client/main.cc index 9ef0cb8..29a6657 100644 --- a/src/client/main.cc +++ b/src/client/main.cc @@ -38,15 +38,16 @@ int main() { Message message; cout << "Type message to server: "; cin >> message.content; - cout << endl; - message.username = "Client 1"; if (strcmp(message.content, "exit") == 0) { break; } - cout << "Sending message to server as user: " << message.username << endl; - send(clientSocket, message.content, strlen(message.content), 0); + cout << endl; + message.username = "Client 1"; + + send(clientSocket, message.toString().data(), + strlen(message.toString().data()), 0); } close(clientSocket); From cfb7478ab948714643511b3e6fb6a3fe93048795 Mon Sep 17 00:00:00 2001 From: "Simon V. Lejel" Date: Sat, 10 Feb 2024 14:26:59 +0100 Subject: [PATCH 5/5] =?UTF-8?q?=F0=9F=9A=B8=20Make=20it=20possible=20to=20?= =?UTF-8?q?exit=20the=20client?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/client/main.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/client/main.cc b/src/client/main.cc index 29a6657..db4317a 100644 --- a/src/client/main.cc +++ b/src/client/main.cc @@ -2,6 +2,7 @@ #include #include #include +#include #include #include @@ -39,7 +40,8 @@ int main() { cout << "Type message to server: "; cin >> message.content; - if (strcmp(message.content, "exit") == 0) { + if (message.content == "exit") { + cout << "BYE!" << endl; break; }