Update cmake.yml

.github/workflows/cmake.yml

@@ -0,0 +1,38 @@
+name: CMake
+
+on:
+  push:
+    branches: [ master, dev ]
+  pull_request:
+    branches: [ master, dev ]
+
+env:
+  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
+  BUILD_TYPE: RelWithDebInfo
+
+jobs:
+  build:
+    # The CMake configure and build commands are platform agnostic and should work equally
+    # well on Windows or Mac.  You can convert this to a matrix build if you need
+    # cross-platform coverage.
+    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Configure CMake
+      # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
+      # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+
+    - name: Build
+      # Build your program with the given configuration
+      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+
+    - name: Test
+      working-directory: ${{github.workspace}}/build
+      # Execute tests defined by the CMake configuration.  
+      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+      run: ctest -C ${{env.BUILD_TYPE}}
+      

CMakeLists.txt

@@ -3,9 +3,4 @@ project(qotd C)
 
 set(CMAKE_C_STANDARD 99)
 
-set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
-set(THREADS_PREFER_PTHREAD_FLAG TRUE)
-find_package(Threads REQUIRED)
-
 add_executable(qotd main.c quote.c quote.h server.c server.h config.h)
-target_link_libraries(qotd Threads::Threads)

config.h

@@ -5,8 +5,8 @@
 #ifndef QOTD_CONFIG_H
 #define QOTD_CONFIG_H
 
-#define QUOTES_FILE "./qotd.txt"
+#define QUOTES_FILE "./quotes.txt"
 #define MESSAGE_STRING_LENGTH 2048
-#define DEFAULT_LISTEN_PORT 7878 // should be 17 to be RFC compliant
+#define DEFAULT_LISTEN_PORT 17 // should be 17 to be RFC compliant
 
 #endif //QOTD_CONFIG_H

main.c

@@ -2,7 +2,7 @@
 
 int main(int argc, char *argv[]) {
     // TODO: shell args
-    server();
+    server(1, 1);
 
     return 0;
 }

quote.c

@@ -5,8 +5,6 @@
 #include "quote.h"
 #include "config.h"
 
-//TODO: error handling
-
 void getRandomQuote(char quote[2048]) {
     int lineCount;
     long line;

server.c

@@ -6,128 +6,122 @@
 #include "config.h"
 
 //TODO: object-like C
-//TODO: refactoring, cleanup
 
 extern int errno;
 
-_Noreturn void udpListen(void *args[]) {
-    struct sockinfo *server = (struct sockinfo *) args[0];
-    struct sockinfo *client = (struct sockinfo *) args[1];
-    char quote[MESSAGE_STRING_LENGTH] = "", clientMessage[MESSAGE_STRING_LENGTH] = "";
-
-    // create args
-    server->handle = socket(server->address->sa_family, SOCK_DGRAM, IPPROTO_UDP);
-    if (server->handle == -1) {
-        perror("socket not created");
-        pthread_exit((void *) 1);
-    }
-    puts("socket created");
-
-    // bind args
-    if (bind(server->handle, server->address, server->addressLength) < 0) {
-        perror("bind failed");
-        pthread_exit((void *) 2);
-    }
+_Noreturn void udpListen(int serverSocket, struct sockaddr * clientAddress, unsigned long addressLength) {
+    char clientMessage[MESSAGE_STRING_LENGTH], quote[MESSAGE_STRING_LENGTH];
 
     for (;;) {
         // receive data
-        if (recvfrom(server->handle, clientMessage, MESSAGE_STRING_LENGTH, 0, client->address,
-                     &client->addressLength) >= 0) {
+
+        if (recvfrom(serverSocket, clientMessage, MESSAGE_STRING_LENGTH, 0, clientAddress, (socklen_t *) &addressLength) >= 0) {
             printf("received: %s\n", clientMessage);
 
             // send data
             getRandomQuote(quote);
             printf("sending: %s\n", quote);
-            if (sendto(server->handle, quote, (long) strlen(quote), 0, client->address, client->addressLength) == -1) {
-                perror("[UDP: SENDTO]");
+            if (sendto(serverSocket, quote, strlen(quote), 0, clientAddress, addressLength) == -1) {
+                perror("udp: sendto");
             }
         } else {
-            perror("[UDP: RECVFROM]");
+            perror("udp: recvfrom");
         }
     }
 }
 
-void tcpListen(void *args[]) {
-    struct sockinfo *server = (struct sockinfo *) args[0];
-    struct sockinfo *client = (struct sockinfo *) args[1];
+void tcpListen(int serverSocket, struct sockaddr * clientAddress, unsigned long addressLength) {
+    int clientSocket;
     char quote[MESSAGE_STRING_LENGTH] = "", clientMessage[MESSAGE_STRING_LENGTH] = "";
 
-    // create args
-    server->handle = socket(server->address->sa_family, SOCK_STREAM, IPPROTO_TCP);
-    if (server->handle == -1) {
-        perror("socket not created");
-        pthread_exit((void *) 1);
-    }
-    puts("socket created");
-
-    // bind args
-    if (bind(server->handle, server->address, server->addressLength) < 0) {
-        perror("bind failed");
-        pthread_exit((void *) 2);
-    }
-
-    listen(server->handle, 5);
+    listen(serverSocket, 5);
     puts("server listening");
 
     // accept connections
     //TODO: t h r e a d s
-    while ((client->handle = accept(server->handle, client->address, &client->addressLength)) >= 0) {
+    while ((clientSocket = accept(serverSocket, clientAddress, (socklen_t *) &addressLength)) >= 0) {
         puts("client connected");
 
         // receive data
-        if (recv(client->handle, clientMessage, MESSAGE_STRING_LENGTH, 0) >= 0) {
+        if (recv(clientSocket, clientMessage, MESSAGE_STRING_LENGTH, 0) >= 0) {
             printf("client says: %s\n", clientMessage);
 
             // send data
             getRandomQuote(quote);
             printf("responding: \"%s\"\n", quote);
-            if (send(client->handle, quote, (long) strlen(quote), 0) == -1) {
-                perror("[TCP: SEND]");
+            if (send(clientSocket, quote, strlen(quote), 0) == -1) {
+                perror("tcp: send");
             }
         } else {
-            perror("[TCP: RECV]");
+            perror("tcp: recv");
         }
 
-        close(client->handle);
+        close(clientSocket);
 
         puts("closed connection");
     }
 
-    if (client->handle < 0) {
-        perror("client connection failed");
-        pthread_exit((void *) 3);
+    if (clientSocket < 0) {
+        puts("client connection failed");
+        exit(3);
     }
 }
 
-void server() {
-    struct sockinfo client;
-    struct sockinfo udp, tcp;
-    struct sockaddr_in6 serverAddress, clientAddress;
+void server(int tcp, int ipv6) {
+    int serverSocket, socketType, socketProtocol;
+    unsigned long serverAddressLength, clientAddressLength;
+    struct sockaddr *serverAddress, *clientAddress;
+    struct sockaddr_in serverAddress4, clientAddress4;
+    struct sockaddr_in6 serverAddress6, clientAddress6;
 
-    serverAddress.sin6_family = AF_INET6;
-    serverAddress.sin6_addr = in6addr_any;
-    serverAddress.sin6_port = htons(DEFAULT_LISTEN_PORT);
+    if (ipv6) {
+        serverAddress6.sin6_family = AF_INET6;
+        serverAddress6.sin6_addr = in6addr_any;
+        serverAddress6.sin6_port = htons(DEFAULT_LISTEN_PORT);
+        serverAddress = (struct sockaddr *) &serverAddress6;
+        serverAddressLength = sizeof serverAddress6;
 
-    tcp.address = (struct sockaddr *) &serverAddress;
-    udp.address = (struct sockaddr *) &serverAddress;
-    tcp.addressLength = sizeof serverAddress;
-    udp.addressLength = sizeof serverAddress;
+        clientAddress6.sin6_family = AF_INET6;
+        clientAddress = (struct sockaddr *) &clientAddress6;
+        clientAddressLength = sizeof clientAddress6;
+    } else {
+        serverAddress4.sin_family = AF_INET;
+        serverAddress4.sin_addr.s_addr = INADDR_ANY;
+        serverAddress4.sin_port = htons(DEFAULT_LISTEN_PORT);
+        serverAddress = (struct sockaddr *) &serverAddress4;
+        serverAddressLength = sizeof serverAddress4;
 
-    clientAddress.sin6_family = AF_INET6;
-    client.address = (struct sockaddr *) &clientAddress;
-    client.addressLength = sizeof clientAddress;
+        clientAddress4.sin_family = AF_INET;
+        clientAddress = (struct sockaddr *) &clientAddress4;
+        clientAddressLength = sizeof clientAddress4;
+    }
 
-    void *tcpArgs[] = {&tcp, &client};
-    void *udpArgs[] = {&udp, &client};
+    if (tcp) {
+        socketType = SOCK_STREAM;
+        socketProtocol = IPPROTO_TCP;
+    } else {
+        socketType = SOCK_DGRAM;
+        socketProtocol = IPPROTO_UDP;
+    }
+
+    // create sock
+    serverSocket = socket(serverAddress->sa_family, socketType, socketProtocol);
+    if (serverSocket == -1) {
+        puts("socket not created");
+        exit(1);
+    }
+    puts("socket created");
+
+    // bind sock
+    if (bind(serverSocket, serverAddress, serverAddressLength) < 0) {
+        puts("bind failed");
+        exit(2);
+    }
 
     // TODO: threads to run both at the same time
-    pthread_t tcpHandle, udpHandle;
-    pthread_attr_t attr;
-    pthread_attr_init(&attr);
-    pthread_create(&tcpHandle, &attr, (void *(*)(void *)) tcpListen, tcpArgs);
-    pthread_create(&udpHandle, &attr, (void *(*)(void *)) udpListen, udpArgs);
-
-    void *tcpReturn, *udpReturn;
-    pthread_join(tcpHandle, tcpReturn);
-    pthread_join(udpHandle, udpReturn);
+    if (tcp) {
+        tcpListen(serverSocket, clientAddress, clientAddressLength);
+    } else {
+        udpListen(serverSocket, clientAddress, clientAddressLength);
+    }
 }

server.h

@@ -14,20 +14,13 @@
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
-#include <pthread.h>
 
 #include "quote.h"
 
-struct sockinfo {
-    int handle;
-    struct sockaddr * address;
-    socklen_t addressLength;
-};
+void server(int tcp, int ipv6);
 
-void server();
+void tcpListen(int serverSocket, struct sockaddr *clientAddress, unsigned long addressLength);
 
-void tcpListen(void * args[]);
-
-_Noreturn void udpListen(void * args[]);
+_Noreturn void udpListen(int serverSocket, struct sockaddr *clientAddress, unsigned long addressLength);
 
 #endif //QOTD_SERVER_H