diff --git a/Dockerfile b/Dockerfile index 582d821..61c8ad0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,4 +10,5 @@ RUN make FROM scratch COPY --from=builder /opt/builder/build/qotd / COPY quotes.txt / +STOPSIGNAL SIGKILL ENTRYPOINT ["/qotd"] \ No newline at end of file diff --git a/client/main.c b/client/main.c index cb65c36..2f1226e 100644 --- a/client/main.c +++ b/client/main.c @@ -8,9 +8,6 @@ #include // read(), write(), close() #include #include "config.h" -#define MAX 80 -#define PORT 17 -#define SA struct sockaddr int main() { @@ -23,17 +20,15 @@ int main() if (sockfd == -1) { printf("socket creation failed...\n"); - exit(0); + exit(1); } - else - printf("Socket successfully created..\n"); // assign IP, PORT servaddr4.sin_family = AF_INET; servaddr4.sin_addr.s_addr = inet_addr("127.0.0.1"); - servaddr4.sin_port = htons(PORT); + servaddr4.sin_port = htons(DEFAULT_LISTEN_PORT); - int status = connect(sockfd, (SA *)&servaddr4, sizeof servaddr4); + int status = connect(sockfd, (struct sockaddr *)&servaddr4, sizeof servaddr4); // connect the client socket to server socket if (status != 0) { @@ -42,15 +37,13 @@ int main() exit(0); } - else - printf("connected to the server..\n"); - struct sockaddr *servaddr = (SA *)&servaddr4; + struct sockaddr *servaddr = (struct sockaddr *)&servaddr4; unsigned int ss = sizeof servaddr; // function for chat char clientMessage[MESSAGE_STRING_LENGTH] = {0}; recvfrom(sockfd, clientMessage, MESSAGE_STRING_LENGTH, 0, servaddr, &ss); - printf(clientMessage); + puts(clientMessage); // close the socket close(sockfd); diff --git a/quotes.txt b/quotes.txt index 221e6b8..4acad9c 100644 --- a/quotes.txt +++ b/quotes.txt @@ -1 +1 @@ -première ligne \n Deuxième ligne +première ligne \n Deuxième ligne \n troixième ligne