From fb4052dcffc3cf31e69e1ae0b01eb7754fcbf26a Mon Sep 17 00:00:00 2001
From: Arthur-Coppey <arthur.coppey@viacesi.fr>
Date: Fri, 26 Nov 2021 13:35:43 +0100
Subject: [PATCH] removed client code and executable, use ncat or similar
 program to communicate with the server

---
 CMakeLists.txt              |  3 +-
 client/client.c             | 90 -------------------------------------
 client/client.h             | 20 ---------
 client/main.c               | 12 -----
 server/main.c => main.c     |  0
 server/quote.c => quote.c   |  0
 server/quote.h => quote.h   |  0
 server/server.c => server.c |  0
 server/server.h => server.h |  0
 9 files changed, 1 insertion(+), 124 deletions(-)
 delete mode 100644 client/client.c
 delete mode 100644 client/client.h
 delete mode 100644 client/main.c
 rename server/main.c => main.c (100%)
 rename server/quote.c => quote.c (100%)
 rename server/quote.h => quote.h (100%)
 rename server/server.c => server.c (100%)
 rename server/server.h => server.h (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c855f88..32c9999 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,5 +3,4 @@ project(qotd C)
 
 set(CMAKE_C_STANDARD 99)
 
-add_executable(server server/main.c server/quote.c server/quote.h server/server.c server/server.h)
-add_executable(client client/main.c client/client.c client/client.h)
\ No newline at end of file
+add_executable(qotd main.c quote.c quote.h server.c server.h)
\ No newline at end of file
diff --git a/client/client.c b/client/client.c
deleted file mode 100644
index 0eabfe6..0000000
--- a/client/client.c
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Created by k0rb4k on 11/10/2021.
-//
-
-#include "client.h"
-
-extern int errno;
-
-int tcp() {
-    struct sockaddr_in server;
-    int sock;
-
-    int proto = IPPROTO_IP;
-    enum __socket_type socketType = SOCK_STREAM;
-
-    server.sin_family = AF_INET;
-    server.sin_addr.s_addr = inet_addr("127.0.0.1");
-    server.sin_port = htons(17);
-
-    sock = socket(server.sin_family, socketType, proto);
-    if (sock == -1) {
-        puts("socket not created");
-        return 1;
-    }
-    puts("socket created");
-
-    if (connect(sock, (const struct sockaddr *) &server, sizeof(server)) < 0) {
-        puts("connection failed");
-        return 2;
-    }
-    puts("connected to server");
-
-    char *payload = "I dream of sushi";
-    if (send(sock, payload, strlen(payload), 0) < 0) {
-        puts("error while sending payload");
-        return 3;
-    }
-    puts("payload sent");
-
-    char response[2048];
-    if (recv(sock, response, 2048, 0) < 0) {
-        puts("receive failed");
-        return 4;
-    }
-    printf("server response : %s\n", response);
-
-    close(sock);
-
-    return 0;
-}
-
-int udp() {
-    struct sockaddr_in server;
-    int sock;
-    unsigned long addressLength = sizeof server;
-
-    int proto = IPPROTO_UDP;
-    enum __socket_type socketType = SOCK_DGRAM;
-
-    server.sin_family = AF_INET;
-    server.sin_addr.s_addr = inet_addr("127.0.0.1");
-    server.sin_port = htons(17);
-
-    sock = socket(server.sin_family, socketType, proto);
-    if (sock == -1) {
-        puts("socket not created");
-        return 1;
-    }
-    puts("socket created");
-
-    char *payload = "I dream of sushi";
-    if (sendto(sock, payload, strlen(payload), 0, (const struct sockaddr *) &server, addressLength) < 0) {
-        puts("error while sending payload");
-        perror("sendto");
-        return 3;
-    }
-    puts("payload sent");
-
-    char response[2048];
-    if (recvfrom(sock, response, 2048, 0, (struct sockaddr *) &server, (socklen_t *) &addressLength) < 0) {
-        puts("receive failed");
-        perror("recvfrom");
-        return 4;
-    }
-    printf("server response : %s\n", response);
-
-    close(sock);
-
-    return 0;
-}
\ No newline at end of file
diff --git a/client/client.h b/client/client.h
deleted file mode 100644
index 17bb0cd..0000000
--- a/client/client.h
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-// Created by k0rb4k on 11/10/2021.
-//
-
-#ifndef QOTD_CLIENT_H
-#define QOTD_CLIENT_H
-
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <errno.h>
-
-int tcp();
-
-int udp();
-
-#endif //QOTD_CLIENT_H
diff --git a/client/main.c b/client/main.c
deleted file mode 100644
index 0b9604f..0000000
--- a/client/main.c
+++ /dev/null
@@ -1,12 +0,0 @@
-//
-// Created by k0rb4k on 22/04/2021.
-//
-
-#include "client.h"
-
-int main(int argc, char *argv[]) {
-    // TODO: arg options for tcp or udp
-    tcp();
-
-    return 0;
-}
\ No newline at end of file
diff --git a/server/main.c b/main.c
similarity index 100%
rename from server/main.c
rename to main.c
diff --git a/server/quote.c b/quote.c
similarity index 100%
rename from server/quote.c
rename to quote.c
diff --git a/server/quote.h b/quote.h
similarity index 100%
rename from server/quote.h
rename to quote.h
diff --git a/server/server.c b/server.c
similarity index 100%
rename from server/server.c
rename to server.c
diff --git a/server/server.h b/server.h
similarity index 100%
rename from server/server.h
rename to server.h