enoch/n2n
1
0
Fork 0
mirror of https://github.com/ntop/n2n.git synced 2024-09-19 16:41:11 +02:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Move win32 specific file to the right dir

Browse Source
This commit is contained in:
Hamish Coleman 2023-07-05 20:26:55 +01:00
parent 83078c8104
commit 6ddaaaa917
4 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -68,7 +68,6 @@ N2N_OBJS=\
src/curve25519.o \ src/curve25519.o \
src/edge_management.o \ src/edge_management.o \
src/edge_utils.o \ src/edge_utils.o \
src/edge_utils_win32.o \
src/header_encryption.o \ src/header_encryption.o \
src/hexdump.o \ src/hexdump.o \
src/json.o \ src/json.o \
@ -104,7 +103,6 @@ N2N_DEPS=$(wildcard include/*.h) $(wildcard src/*.c) config.mak
# is passing the linter tests, this can be refactored) # is passing the linter tests, this can be refactored)
LINT_CCODE=\ LINT_CCODE=\
include/curve25519.h \ include/curve25519.h \
include/edge_utils_win32.h \
include/header_encryption.h \ include/header_encryption.h \
include/hexdump.h \ include/hexdump.h \
include/n2n_define.h \ include/n2n_define.h \
@ -116,7 +114,6 @@ LINT_CCODE=\
include/speck.h \ include/speck.h \
include/tf.h \ include/tf.h \
src/edge_management.c \ src/edge_management.c \
src/edge_utils_win32.c \
src/example_edge_embed_quick_edge_init.c \ src/example_edge_embed_quick_edge_init.c \
src/header_encryption.c \ src/header_encryption.c \
src/management.c \ src/management.c \
@ -130,6 +127,8 @@ LINT_CCODE=\
src/tuntap_linux.c \ src/tuntap_linux.c \
src/tuntap_netbsd.c \ src/tuntap_netbsd.c \
src/tuntap_osx.c \ src/tuntap_osx.c \
src/win32/edge_utils_win32.c \
src/win32/edge_utils_win32.h \
src/wire.c \ src/wire.c \
tools/tests-auth.c \ tools/tests-auth.c \
tools/tests-compress.c \ tools/tests-compress.c \
@ -194,6 +193,7 @@ src/example_sn_embed: $(N2N_LIB)
src/example_edge_embed: $(N2N_LIB) src/example_edge_embed: $(N2N_LIB)
ifneq (,$(findstring mingw,$(CONFIG_HOST_OS))) ifneq (,$(findstring mingw,$(CONFIG_HOST_OS)))
N2N_OBJS+=src/win32/edge_utils_win32.o
N2N_OBJS+=src/win32/getopt1.o N2N_OBJS+=src/win32/getopt1.o
N2N_OBJS+=src/win32/getopt.o N2N_OBJS+=src/win32/getopt.o
N2N_OBJS+=src/win32/wintap.o N2N_OBJS+=src/win32/wintap.o

2
src/edge_utils.c
View File

@ -43,7 +43,7 @@
#ifdef _WIN32 #ifdef _WIN32
#include <winsock2.h> #include <winsock2.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
#include "edge_utils_win32.h" #include "win32/edge_utils_win32.h"
#else #else
#include <arpa/inet.h> // for inet_ntoa, inet_addr, inet_ntop #include <arpa/inet.h> // for inet_ntoa, inet_addr, inet_ntop
#include <netinet/in.h> // for sockaddr_in, ntohl, IPPROTO_IP #include <netinet/in.h> // for sockaddr_in, ntohl, IPPROTO_IP

6
src/edge_utils_win32.c → src/win32/edge_utils_win32.c
View File

@ -16,8 +16,6 @@
* *
*/ */
#ifdef _WIN32
#include <winsock2.h> #include <winsock2.h>
#include "edge_utils_win32.h" #include "edge_utils_win32.h"
@ -107,7 +105,3 @@ int get_best_interface_ip (n2n_edge_t * eee, dec_ip_str_t *ip_addr){
} }
return 0; return 0;
} }
#endif

0
include/edge_utils_win32.h → src/win32/edge_utils_win32.h
View File