From 1f20c707723a9a631552cb0487b68aa5abb220f3 Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Thu, 15 Dec 2022 10:26:28 +0100
Subject: [PATCH] Add union for sock addr

---
 src/client.c   | 6 +++---
 src/lib/sock.h | 5 ++++-
 src/server.c   | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/client.c b/src/client.c
index e99730c..4cafa78 100644
--- a/src/client.c
+++ b/src/client.c
@@ -755,7 +755,7 @@ int client_connection_handler(client_ctx_t *ctx, sock *client, unsigned long cli
 
     ctx->cc[0] = 0;
     ctx->geoip[0] = 0;
-    geoip_lookup_country((struct sockaddr *) &client->addr, ctx->cc);
+    geoip_lookup_country(&client->addr.sock, ctx->cc);
 
     info("Connection accepted from %s %s%s%s[%s]", ctx->addr, ctx->host[0] != 0 ? "(" : "",
          ctx->host[0] != 0 ? ctx->host : "", ctx->host[0] != 0 ? ") " : "",
@@ -819,7 +819,7 @@ int client_handler(sock *client, unsigned long client_num) {
     signal(SIGINT, client_terminate);
     signal(SIGTERM, client_terminate);
 
-    inet_ntop(client->addr.sin6_family, (void *) &client->addr.sin6_addr, ctx._c_addr, sizeof(ctx._c_addr));
+    inet_ntop(client->addr.ipv6.sin6_family, &client->addr.ipv6.sin6_addr, ctx._c_addr, sizeof(ctx._c_addr));
     if (strncmp(ctx._c_addr, "::ffff:", 7) == 0) {
         ctx.addr = ctx._c_addr + 7;
     } else {
@@ -838,7 +838,7 @@ int client_handler(sock *client, unsigned long client_num) {
 
     sprintf(log_client_prefix, "[%s%4i%s]%s[%*s][%5i]%s", (int) client->enc ? HTTPS_STR : HTTP_STR,
             ntohs(server_addr->sin6_port), CLR_STR, color_table[client_num % 6], INET6_ADDRSTRLEN, ctx.addr,
-            ntohs(client->addr.sin6_port), CLR_STR);
+            ntohs(client->addr.ipv6.sin6_port), CLR_STR);
 
     sprintf(log_conn_prefix, "[%6i][%*s]%s", getpid(), INET6_ADDRSTRLEN, ctx.s_addr, log_client_prefix);
     logger_set_prefix(log_conn_prefix);
diff --git a/src/lib/sock.h b/src/lib/sock.h
index 6ce0a01..b5b67dc 100644
--- a/src/lib/sock.h
+++ b/src/lib/sock.h
@@ -16,7 +16,10 @@
 typedef struct {
     unsigned int enc:1;
     int socket;
-    struct sockaddr_in6 addr;
+    union {
+        struct sockaddr sock;
+        struct sockaddr_in6 ipv6;
+    } addr;
     SSL_CTX *ctx;
     SSL *ssl;
     long _last_ret;
diff --git a/src/server.c b/src/server.c
index 397a611..ade1b4b 100644
--- a/src/server.c
+++ b/src/server.c
@@ -321,7 +321,7 @@ int main(int argc, const char *argv[]) {
         for (int i = 0; i < NUM_SOCKETS; i++) {
             if (poll_fds[i].revents & POLLIN) {
                 socklen_t addr_len = sizeof(client.addr);
-                client_fd = accept(sockets[i], (struct sockaddr *) &client.addr, &addr_len);
+                client_fd = accept(sockets[i], &client.addr.sock, &addr_len);
                 if (client_fd < 0) {
                     critical("Unable to accept connection");
                     continue;