Maint/refactor (#12)

* Move dual stack setup to netex.c

* make netex a static library

* Spefify C99

* Convert cpp stuff to c

* Update README

* stagger windows, cleaning up...

* don't thread accept

* Multipeer shapes

* sdl cleanup and bug fixes

* Remove unneeded includes

* more cleanup

* CI: Add windows

* CI: Add MacOS

* Use win32 Platform header guards

* Remove sleep suffix (fix test on MacOS)

* Fix clang warnings

* Windowize

* Remove global struct conn_inf

* Rename main struct and vars

* Make recv_args more human friendly

* Rename the sdl example and update docs

Author: andy5995

.clang-format

@@ -116,7 +116,7 @@ BreakFunctionDefinitionParameters: false
 BreakInheritanceList: BeforeColon
 BreakStringLiterals: true
 BreakTemplateDeclarations: MultiLine
-ColumnLimit:     80
+ColumnLimit:     100
 CommentPragmas:  '^ IWYU pragma:'
 CompactNamespaces: false
 ConstructorInitializerIndentWidth: 4

.github/workflows/c-cpp.yml renamed to .github/workflows/linux.yml

@@ -1,13 +1,24 @@
-name: C/C++ CI
+name: Linux
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
   cancel-in-progress: true
 
 on:
   push:
     branches: [ trunk ]
+    paths:
+    - '**'
+    - '!**.yml'
+    - '!**.md'
+    - '**/linux.yml'
+
   pull_request:
     branches: [ trunk ]
+    paths:
+    - '**'
+    - '!**.yml'
+    - '!**.md'
+    - '**/linux.yml'
 
 jobs:
   build:

.github/workflows/macos.yml

@@ -0,0 +1,45 @@
+name: MacOS
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
+on:
+  push:
+    branches: [ trunk ]
+    paths:
+    - '**'
+    - '!**.yml'
+    - '!**.md'
+    - '**/macos.yml'
+
+  pull_request:
+    branches: [ trunk ]
+    paths:
+    - '**'
+    - '!**.yml'
+    - '!**.md'
+    - '**/macos.yml'
+
+jobs:
+  macos:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Install dependencies
+      run: |
+        brew install \
+          meson \
+          sdl2
+
+    - name: Meson setup
+      run: |
+        meson setup _build -Db_sanitize=none
+
+    - name: Build
+      run: |
+        meson compile -C _build
+
+    - name: Test
+      run: |
+        meson test -v -C _build

.github/workflows/windows.yml

@@ -0,0 +1,58 @@
+name: Windows
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
+on:
+  push:
+    branches: [ trunk ]
+    paths:
+    - '**'
+    - '!**.yml'
+    - '!**.md'
+    - '**/windows.yml'
+
+  pull_request:
+    branches: [ trunk ]
+    paths:
+    - '**'
+    - '!**.yml'
+    - '!**.md'
+    - '**/windows.yml'
+
+jobs:
+  MSYS2:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: msys2/setup-msys2@v2
+      with:
+        msystem: mingw64
+        pacboy: >-
+          gcc:p
+          ninja:p
+          pkgconf:p
+        update: true
+
+    - name: Install dependencies
+      shell: msys2 {0}
+      run: |
+        pacman --noconfirm --needed -S \
+          mingw-w64-x86_64-meson \
+          mingw-w64-x86_64-SDL2 \
+          mingw-w64-x86_64-winpthreads
+
+    - name: Meson setup
+      shell: msys2 {0}
+      run: |
+        meson setup _build
+
+    - name: Build
+      shell: msys2 {0}
+      run: |
+        meson compile -C _build
+
+    - name: Test
+      shell: msys2 {0}
+      run: |
+        meson test -v -C _build

README.md

@@ -6,11 +6,11 @@ TCP and UDP examples of networking in C
 
 Website: https://github.com/andy5995/c_networking_examples
 
-## tcp_dual_stack_sdl2_window server and client
+## TCP SDL Window Updater server and client
 
-When the server is run, an SDL window is created with a red circle. Connect
-with the client. When you click in the server window, the red circle will move
-in the client window.
+When you connect to the server with the client, a window rendered with sdl
+will be created. Clicking in the client or server window will move a geometric
+shape to the coordinates where you clicked.
 
 ## Dual Stack Echo Server
 
@@ -59,15 +59,11 @@ to change that yet.
 
 ## Compiling
 
-You can compile the c files individually:
-
-    cc -Wall 'example.c' netex.c -o 'example'
-
-or use [meson](https://mesonbuild.com/) to build them all at once:
-
-    meson builddir
-    cd builddir
-    ninja
+```sh
+meson builddir
+cd builddir
+ninja
+```
 
 ## See Also
 

dual_stack_echo_client.c

@@ -1,74 +1,30 @@
 /*
  * dual_stack_echo_client.c
  *
- * This is adapted from code generated by ChatGPT and examples provided
- * in the C library documentation
- *
  */
 
-#include <arpa/inet.h>
-#include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/socket.h>
-#include <sys/types.h>
 #include <unistd.h>
 
-#define PORT "12345" // Must match the server's port
+#include "netex.h"
 
 int main(int argc, char *argv[]) {
-  char *server_addr = NULL;
-  if (argc == 2)
-    server_addr = argv[1];
-  else {
-    fputs("You must provide the server address.\n", stderr);
-    return 1;
-  }
+  struct socket_info_t socket_info;
+  parse_client_opts(argc, argv, &socket_info);
+  assign_tcp_dual_stack_client_fd(&socket_info);
 
-  int client_fd;
-  struct addrinfo hints, *res, *p;
   char buffer[1024];
-
-  // Set up hints for getaddrinfo()
-  memset(&hints, 0, sizeof(hints));
-  hints.ai_family = AF_UNSPEC; // Allow both IPv4 and IPv6
-  hints.ai_socktype = SOCK_STREAM;
-
-  // Get address info
-  if (getaddrinfo(server_addr, PORT, &hints, &res) != 0) {
-    perror("getaddrinfo");
-    return 1;
-  }
-
-  // Try to connect to one of the results
-  for (p = res; p != NULL; p = p->ai_next) {
-    client_fd = socket(p->ai_family, p->ai_socktype, p->ai_protocol);
-    if (client_fd == -1)
-      continue;
-
-    if (connect(client_fd, p->ai_addr, p->ai_addrlen) == 0)
-      break; // Connected successfully
-
-    close(client_fd);
-  }
-
-  freeaddrinfo(res);
-
-  if (!p) {
-    perror("Failed to connect");
-    return 1;
-  }
-
   // Read response from server
-  ssize_t bytes_received = recv(client_fd, buffer, sizeof(buffer) - 1, 0);
+  ssize_t bytes_received = recv(socket_info.sockfd, buffer, sizeof(buffer) - 1, 0);
   if (bytes_received > 0) {
-    buffer[bytes_received] = '\0'; // Null-terminate received data
+    buffer[bytes_received] = '\0';
     printf("Server response: %s", buffer);
   } else {
     perror("recv");
   }
 
-  close(client_fd);
+  close_socket_checked(socket_info.sockfd);
   return 0;
 }