From 004397756603bd6c94809737fb22a14e73a6fa15 Mon Sep 17 00:00:00 2001 From: Elkan Roelen Date: Tue, 11 Sep 2018 15:05:19 +0200 Subject: [PATCH 1/5] Fix macOs build --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4654d9bf..9b31fb11 100755 --- a/Makefile +++ b/Makefile @@ -360,10 +360,10 @@ client: $(MAKE) release/quake2 ifeq ($(YQ2_OSTYPE), Darwin) -build/client/%.o : %.m +build/client/%.o : %.c @echo "===> CC $<" ${Q}mkdir -p $(@D) - ${Q}$(CC) $(OSX_ARCH) -x objective-c -c $< -o $@ + ${Q}$(CC) $(OSX_ARCH) -x objective-c -c $(CFLAGS) $(SDLCFLAGS) $(ZIPCFLAGS) $(INCLUDE) $< -o $@ else build/client/%.o: %.c @echo "===> CC $<" From 0720409d3e51b594160ab9731fe25031fad5f479 Mon Sep 17 00:00:00 2001 From: Elkan Roelen Date: Tue, 11 Sep 2018 15:06:44 +0200 Subject: [PATCH 2/5] Update network.c Fix IPV6 for MacOS - probably other OS'es too. --- src/backends/unix/network.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backends/unix/network.c b/src/backends/unix/network.c index 3cb5aa60..93b8449f 100644 --- a/src/backends/unix/network.c +++ b/src/backends/unix/network.c @@ -829,7 +829,7 @@ NET_Socket(char *net_interface, int port, netsrc_t type, int family) if (!net_interface || !net_interface[0] || !Q_stricmp(net_interface, "localhost")) { - Host = (family == AF_INET6) ? "::" : "0.0.0.0"; + Host = (family == AF_INET6) ? "::1" : "0.0.0.0"; } else { From b5b491710c7ff21b96eaf88d699f833a9e6d532e Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 11 Sep 2018 15:07:37 +0200 Subject: [PATCH 3/5] Fixed incorrect ipv6 local address --- src/backends/unix/network.c | 2 +- src/backends/windows/network.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backends/unix/network.c b/src/backends/unix/network.c index 3cb5aa60..93b8449f 100644 --- a/src/backends/unix/network.c +++ b/src/backends/unix/network.c @@ -829,7 +829,7 @@ NET_Socket(char *net_interface, int port, netsrc_t type, int family) if (!net_interface || !net_interface[0] || !Q_stricmp(net_interface, "localhost")) { - Host = (family == AF_INET6) ? "::" : "0.0.0.0"; + Host = (family == AF_INET6) ? "::1" : "0.0.0.0"; } else { diff --git a/src/backends/windows/network.c b/src/backends/windows/network.c index 11c255d4..8ffdce2c 100644 --- a/src/backends/windows/network.c +++ b/src/backends/windows/network.c @@ -821,7 +821,7 @@ NET_IPSocket(char *net_interface, int port, netsrc_t type, int family) if (!net_interface || !net_interface[0] || !stricmp(net_interface, "localhost")) { - Host = (family == AF_INET6) ? "::" : "0.0.0.0"; + Host = (family == AF_INET6) ? "::1" : "0.0.0.0"; } else { From 220f0a940a31007fe3e8ea181d908b478e6fd552 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 11 Sep 2018 15:35:21 +0200 Subject: [PATCH 4/5] Fixed ipv6 address to use 0.0.0.0 instead of 127.0.0.1 --- src/backends/unix/network.c | 2 +- src/backends/windows/network.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backends/unix/network.c b/src/backends/unix/network.c index 93b8449f..d99b2663 100644 --- a/src/backends/unix/network.c +++ b/src/backends/unix/network.c @@ -829,7 +829,7 @@ NET_Socket(char *net_interface, int port, netsrc_t type, int family) if (!net_interface || !net_interface[0] || !Q_stricmp(net_interface, "localhost")) { - Host = (family == AF_INET6) ? "::1" : "0.0.0.0"; + Host = (family == AF_INET6) ? "::/0" : "0.0.0.0"; } else { diff --git a/src/backends/windows/network.c b/src/backends/windows/network.c index 8ffdce2c..b39ace98 100644 --- a/src/backends/windows/network.c +++ b/src/backends/windows/network.c @@ -821,7 +821,7 @@ NET_IPSocket(char *net_interface, int port, netsrc_t type, int family) if (!net_interface || !net_interface[0] || !stricmp(net_interface, "localhost")) { - Host = (family == AF_INET6) ? "::1" : "0.0.0.0"; + Host = (family == AF_INET6) ? "::/0" : "0.0.0.0"; } else { From 79bcd35a3dd7b765344f19cab3fccd9642b58dd2 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 12 Sep 2018 08:55:13 +0200 Subject: [PATCH 5/5] Changed ipv6 address --- src/backends/unix/network.c | 2 +- src/backends/windows/network.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backends/unix/network.c b/src/backends/unix/network.c index d99b2663..2c5abc56 100644 --- a/src/backends/unix/network.c +++ b/src/backends/unix/network.c @@ -829,7 +829,7 @@ NET_Socket(char *net_interface, int port, netsrc_t type, int family) if (!net_interface || !net_interface[0] || !Q_stricmp(net_interface, "localhost")) { - Host = (family == AF_INET6) ? "::/0" : "0.0.0.0"; + Host = (family == AF_INET6) ? "::/128" : "0.0.0.0"; } else { diff --git a/src/backends/windows/network.c b/src/backends/windows/network.c index b39ace98..e3c25edc 100644 --- a/src/backends/windows/network.c +++ b/src/backends/windows/network.c @@ -821,7 +821,7 @@ NET_IPSocket(char *net_interface, int port, netsrc_t type, int family) if (!net_interface || !net_interface[0] || !stricmp(net_interface, "localhost")) { - Host = (family == AF_INET6) ? "::/0" : "0.0.0.0"; + Host = (family == AF_INET6) ? "::/128" : "0.0.0.0"; } else {