From 0fcf18fab2a63fe7ed225abce55e01f2692b3900 Mon Sep 17 00:00:00 2001
From: Hamish Coleman <hamish@zot.org>
Date: Thu, 15 Jun 2023 21:45:59 +0100
Subject: [PATCH] Fix edge.c

---
 src/edge.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/edge.c b/src/edge.c
index 6ed461f..9e6b501 100644
--- a/src/edge.c
+++ b/src/edge.c
@@ -17,22 +17,15 @@
  */
 
 
-#include <arpa/inet.h>               // for inet_addr, inet_ntop
-#include <bits/getopt_core.h>        // for optind, optarg
 #include <ctype.h>                   // for isspace
-#include <endian.h>                  // for htobe32
 #include <errno.h>                   // for errno
 #include <getopt.h>                  // for required_argument, no_argument
-#include <netinet/in.h>              // for INADDR_ANY, INADDR_NONE, ntohl
-#include <pwd.h>                     // for getpwnam, passwd
 #include <signal.h>                  // for signal, SIG_IGN, SIGPIPE, SIGCHLD
 #include <stdint.h>                  // for uint8_t, uint16_t
 #include <stdio.h>                   // for printf, NULL, fclose, snprintf
 #include <stdlib.h>                  // for atoi, exit, calloc, free, malloc
 #include <string.h>                  // for strncpy, memset, strlen, strcmp
 #include <sys/param.h>               // for MIN
-#include <sys/select.h>              // for select, FD_ISSET, FD_SET, FD_ZERO
-#include <sys/socket.h>              // for AF_INET
 #include <sys/time.h>                // for timeval
 #include <sys/types.h>               // for u_char
 #include <time.h>                    // for time
@@ -42,11 +35,22 @@
 #include "n2n.h"                     // for n2n_edge_conf_t, n2n_edge_t, fil...
 #include "network_traffic_filter.h"  // for process_traffic_filter_rule_str
 #include "pearson.h"                 // for pearson_hash_64
+#include "portable_endian.h"         // for htobe32
 #include "random_numbers.h"          // for n2n_seed, n2n_srand
 #include "sn_selection.h"            // for sn_selection_sort, sn_selection_...
 #include "speck.h"                   // for speck_init, speck_context_t
 #include "uthash.h"                  // for UT_hash_handle, HASH_ADD, HASH_C...
 
+#ifdef WIN32
+#include <winsock.h>
+#include <ws2tcpip.h>
+#else
+#include <arpa/inet.h>               // for inet_addr, inet_ntop
+#include <netinet/in.h>              // for INADDR_ANY, INADDR_NONE, ntohl
+#include <pwd.h>                     // for getpwnam, passwd
+#include <sys/select.h>              // for select, FD_ISSET, FD_SET, FD_ZERO
+#include <sys/socket.h>              // for AF_INET
+#endif
 
 /* *************************************************** */