vlmcsd-svn977-2016-07-13-Hotbird64

GNUmakefile

@@ -34,7 +34,7 @@ ifneq (,$(findstring darwin,$(TARGETPLATFORM)))
   UNIX := 1
 endif
 
-ifneq (,$(findstring androideabi,$(TARGETPLATFORM)))
+ifneq (,$(findstring android,$(TARGETPLATFORM)))
   ANDROID := 1
   UNIX := 1
   ELF := 1
@@ -139,6 +139,12 @@ ifeq ($(NOLIBS),1)
   NOLPTHREAD=1
 endif
 
+ifneq ($(NOLIBS),1)
+  ifeq ($(MINGW),1)
+    BASELDFLAGS += -lws2_32 -liphlpapi
+  endif
+endif 
+
 ifneq ($(NO_DNS),1)
   ifneq ($(ANDROID),1)
   ifneq ($(NOLRESOLV),1)
@@ -198,7 +204,7 @@ else
   STRIPFLAGS += -s
 endif
 
-LIBRARY_CFLAGS = -DSIMPLE_SOCKETS -DNO_TIMEOUT -DNO_SIGHUP -DNO_CL_PIDS -DNO_EXTENDED_PRODUCT_LIST -DNO_BASIC_PRODUCT_LIST -DNO_LOG -DNO_RANDOM_EPID -DNO_INI_FILE -DNO_INI_FILE -DNO_HELP -DNO_CUSTOM_INTERVALS -DNO_PID_FILE -DNO_USER_SWITCH -DNO_VERBOSE_LOG -DNO_LIMIT -DNO_VERSION_INFORMATION
+LIBRARY_CFLAGS = -DSIMPLE_SOCKETS -DNO_TIMEOUT -DNO_SIGHUP -DNO_CL_PIDS -DNO_EXTENDED_PRODUCT_LIST -DNO_BASIC_PRODUCT_LIST -DNO_LOG -DNO_RANDOM_EPID -DNO_INI_FILE -DNO_INI_FILE -DNO_HELP -DNO_CUSTOM_INTERVALS -DNO_PID_FILE -DNO_USER_SWITCH -DNO_VERBOSE_LOG -DNO_LIMIT -DNO_VERSION_INFORMATION -DNO_PRIVATE_IP_DETECT
 
 ifeq ($(FEATURES), embedded)
   BASECFLAGS += -DNO_HELP -DNO_USER_SWITCH -DNO_BASIC_PRODUCT_LIST -DNO_CUSTOM_INTERVALS -DNO_PID_FILE -DNO_VERBOSE_LOG -DNO_VERSION_INFORMATION
@@ -218,6 +224,10 @@ ifdef INI
   BASECFLAGS += -DINI_FILE=\"$(INI)\"
 endif
 
+ifeq ($(NO_GETIFADDRS), 1)
+  BASECFLAGS += -DNO_GETIFADDRS
+endif
+
 ifeq ($(THREADS), 1)
   BASECFLAGS += -DUSE_THREADS
 endif
@@ -340,6 +350,26 @@ else
   SRCS += network.c rpc.c  
 endif
 
+ifeq ($(GETIFADDRS),musl)
+ifneq ($(NO_GETIFADDRS),1)
+  BASECFLAGS += -DGETIFADDRS_MUSL
+  VLMCSD_SRCS += getifaddrs-musl.c
+  MULTI_SRCS += getifaddrs-musl.c
+  VLMCS_SRCS += getifaddrs-musl.c
+  DLL_SRCS += getifaddrs-musl.c
+  MULTI_OBJS += getifaddrs-musl.o
+endif
+endif
+
+ifeq ($(ANDROID),1)
+ifneq ($(NO_GETIFADDRS),1)
+  VLMCSD_SRCS += ifaddrs-android.c
+  MULTI_SRCS += ifaddrs-android.c
+  DLL_SRCS += ifaddrs-android.c
+  MULTI_OBJS += ifaddrs-android.o
+endif
+endif
+
 ifeq "$(WIN)" "1"
 	VLMCSD_SRCS += ntservice.c
 	MULTI_SRCS += ntservice.c
@@ -614,7 +644,7 @@ help:
 	@echo "    -DNO_LIMIT                   Don't support limiting concurrent clients in $(PROGRAM_NAME)."
 	@echo "    -DNO_SIGHUP                  Don't support SIGHUP handling in $(PROGRAM_NAME)."
 	@echo "    -DNO_VERSION_INFORMATION     Don't support displaying version information in $(PROGRAM_NAME) and $(CLIENT_NAME). Removes -V option."
-	@echo "    -DENABLE_DEPRECATED_OPTIONS  Enable command line options that provide compatibility with previous versions of $(PROGRAM_NAME)."
+	@echo "    -DNO_PRIVATE_IP_DETECT       Don't support protection against clients with public IP addresses in $(PROGRAM_NAME)"	
 	@echo ""
 	@echo "Troubleshooting options"
 	@echo "    CAT=1                        Combine all sources in a single in-memory file and compile directly to target."
@@ -627,6 +657,8 @@ help:
 	@echo "    NO_TIMEOUT=1                 Do not set timeouts for sockets (for systems that don't support it)."
 	@echo "    CHILD_HANDLER=1              Install a handler for SIGCHLD (for systems that don't support SA_NOCLDWAIT)."
 	@echo "    NO_DNS=1                     Compile $(CLIENT_NAME) without support for detecting KMS servers via DNS."
+	@echo "    NO_GETIFADDRS=1              Compile $(PROGRAM_NAME) without using getifaddrs()."
+	@echo "    GETIFADDRS=musl              Compile $(PROGRAM_NAME) with its own implementation of getifaddrs() based on musl."
 	@echo "    DNS_PARSER=internal          Use $(CLIENT_NAME) internal DNS parsing routines. No effect on MingW (native Windows)."
 	@echo ""
 	@echo "Other useful CFLAGS"

config.h

@@ -82,26 +82,6 @@
 
 
 
-/*
- * -------------------------------
- * Backward compatibility
- * -------------------------------
- */
-
-
-#if !defined(ENABLE_DEPRECATED_OPTIONS)
-/*
- * comment out the following line if you want vlmcsd no to support command line options
- * that have been present in previous versions of vlmcsd and are now obsolete
- */
-
-//#define ENABLE_DEPRECATED_OPTIONS
-
-#endif // ENABLE_DEPRECATED_OPTIONS
-
-
-
-
 /*
  * ----------------------------------------------------------------------------------------
  * Troubleshooting options. Please note that disabling features may also help troubleshooting.
@@ -556,6 +536,19 @@
 
 
 
+#ifndef NO_PRIVATE_IP_DETECT
+/*
+ * Disables the ability to protect vlmcsd against KMS requests from public IP addresses.
+ * Removes -o from the command line.
+ */
+
+//#define NO_PRIVATE_IP_DETECT
+
+#endif // NO_PRIVATE_IP_DETECT
+
+
+
+
 #ifndef NO_SOCKETS
 /*
  * Disables standalone startup of vlmcsd. If you use this config directive, you must start vlmcsd from an internet
@@ -634,7 +627,6 @@
 
 
 
-
 /* Don't change anything BELOW this line */
 
 

floppy/.config-busybox

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.25.0.git
-# Thu Jun 16 21:09:56 2016
+# Sat Jun 18 02:37:59 2016
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -614,8 +614,8 @@ CONFIG_FEATURE_DMESG_PRETTY=y
 # CONFIG_HWCLOCK is not set
 # CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set
 # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
-CONFIG_IPCRM=y
-CONFIG_IPCS=y
+# CONFIG_IPCRM is not set
+# CONFIG_IPCS is not set
 # CONFIG_LOSETUP is not set
 # CONFIG_LSPCI is not set
 # CONFIG_LSUSB is not set
@@ -778,12 +778,12 @@ CONFIG_PING=y
 CONFIG_PING6=y
 CONFIG_FEATURE_FANCY_PING=y
 CONFIG_WGET=y
-CONFIG_FEATURE_WGET_STATUSBAR=y
+# CONFIG_FEATURE_WGET_STATUSBAR is not set
 CONFIG_FEATURE_WGET_AUTHENTICATION=y
 CONFIG_FEATURE_WGET_LONG_OPTIONS=y
 CONFIG_FEATURE_WGET_TIMEOUT=y
-CONFIG_FEATURE_WGET_OPENSSL=y
-CONFIG_FEATURE_WGET_SSL_HELPER=y
+# CONFIG_FEATURE_WGET_OPENSSL is not set
+# CONFIG_FEATURE_WGET_SSL_HELPER is not set
 # CONFIG_WHOIS is not set
 CONFIG_FEATURE_IPV6=y
 # CONFIG_FEATURE_UNIX_LOCAL is not set