From 19a02a84ae03be8c1b3840fc792010f8ba3d3b48 Mon Sep 17 00:00:00 2001 From: Arthur-Coppey Date: Sun, 22 Aug 2021 01:03:08 +0200 Subject: [PATCH] comments and cleanup --- client/main.c | 3 +-- server/main.c | 1 - server/quote.c | 1 - server/server.c | 8 +++++++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/client/main.c b/client/main.c index 5a514e4..4183b0c 100644 --- a/client/main.c +++ b/client/main.c @@ -43,8 +43,7 @@ int main(int argc, char *argv[]) { puts("receive failed"); return 4; } - puts("server response :"); - puts(response); + printf("server response : %s\n", response); close(sock); diff --git a/server/main.c b/server/main.c index 2493988..846bbf1 100644 --- a/server/main.c +++ b/server/main.c @@ -1,4 +1,3 @@ -#include "quote.h" #include "server.h" int main(int argc, char *argv[]) { diff --git a/server/quote.c b/server/quote.c index 5151676..bcc0f38 100644 --- a/server/quote.c +++ b/server/quote.c @@ -12,7 +12,6 @@ void getRandomQuote(char quote[1024]) { void getQuote(int line, char quote[1024]) { FILE* list; -// char quote[1024]; // TODO: get specified x line diff --git a/server/server.c b/server/server.c index 1ba3623..b878cac 100644 --- a/server/server.c +++ b/server/server.c @@ -12,10 +12,12 @@ void tcpServer() { char quote[MESSAGE_STRING_LENGTH] = ""; char clientMessage[MESSAGE_STRING_LENGTH] = ""; + /*initialize socket info*/ serverAddress.sin_family = AF_INET; serverAddress.sin_addr.s_addr = INADDR_ANY; serverAddress.sin_port = htons(17); + /*create socket*/ serverSocket = socket(serverAddress.sin_family, SOCK_STREAM, IPPROTO_IP); if (serverSocket == -1) { puts("socket not created"); @@ -23,15 +25,19 @@ void tcpServer() { } puts("socket created"); + /*bind socket to address:port*/ if (bind(serverSocket, (const struct sockaddr *) &serverAddress, sizeof serverAddress) < 0) { puts("bind failed"); exit(2); } puts("address bound"); + /*start listening*/ listen(serverSocket, 5); puts("server listening"); + /*accept connections*/ + //TODO: t h r e a d s addressLength = sizeof(struct sockaddr_in); while ((clientSocket = accept(serverSocket, (struct sockaddr *) &clientAddress, (socklen_t *) &addressLength)) >= 0) { puts("client connected"); @@ -60,5 +66,5 @@ void tcpServer() { } void udpServer() { - + //TODO: udp handling }