vlmcsd-1108-2017-01-19-Hotbird64

Wind4 · Feb 11, 2017 · 5a29226 · 5a29226
1 parent c5e1a0a
commit 5a29226
Show file tree

Hide file tree

Showing 29 changed files with 1,008 additions and 654 deletions.
diff --git a/etc/vlmcsd.ini b/etc/vlmcsd.ini
@@ -116,6 +116,12 @@
 # Command line: -R
 ;RenewalInterval = 7d
 
+# Exit vlmcsd if warning of certain level has been reached
+# Command line: -x
+# 0 = Never
+# 1 = Exit, if any listening socket could not be established or TAP error occurs
+;ExitLevel = 0
+
 # Run program as user vlmcsduser
 # Command line: -u
 ;user = vlmcsduser

diff --git a/floppy/floppy144.vfd b/floppy/floppy144.vfd
diff --git a/hotbird64-mass-build/make_linux b/hotbird64-mass-build/make_linux
@@ -711,7 +711,7 @@ export PROGRAM_NAME=../binaries/Android/intel/bionic/vlmcsd-android23-x86
 export MULTI_NAME=../binaries/Android/intel/static/vlmcsdmulti-android23-x86
 export CC=/opt/toolchains/x86-android-9/bin/i686-linux-android-gcc
 export CFLAGS="$SMALLCC"
-export PLATFORMFLAGS="-flto=16 -fwhole-program -march=atom -m32"
+export PLATFORMFLAGS="-flto=16 -fwhole-program -march=i386 -m32"
 export THREADS=1
 export LDFLAGS="$SMALLLD"
 
@@ -745,7 +745,7 @@ export PROGRAM_NAME=../binaries/Android/intel/bionic/vlmcsd-android41-x86
 export MULTI_NAME=../binaries/Android/intel/bionic/vlmcsdmulti-android41-x86
 export CC=/opt/toolchains/x86-android-16/bin/i686-linux-android-gcc
 export CFLAGS="$SMALLCC"
-export PLATFORMFLAGS="-flto=16 -fwhole-program -march=atom -m32 -fPIE -pie"
+export PLATFORMFLAGS="-flto=16 -fwhole-program -march=i386 -m32 -fPIE -pie"
 export THREADS=1
 export LDFLAGS="$SMALLLD"
 
@@ -797,7 +797,7 @@ export PROGRAM_NAME=../binaries/Android/intel/bionic/vlmcsd-android50-x64
 export MULTI_NAME=../binaries/Android/intel/bionic/vlmcsdmulti-android50-x64
 export CC=/opt/toolchains/x86_64-android-21/bin/x86_64-linux-android-gcc
 export CFLAGS="$SMALLCC"
-export PLATFORMFLAGS="-flto=16 -fwhole-program -march=atom -m64 -fPIE -pie"
+export PLATFORMFLAGS="-flto=16 -fwhole-program -m64 -fPIE -pie"
 export THREADS=0
 export LDFLAGS="$SMALLLD"
 
@@ -819,7 +819,7 @@ export PROGRAM_NAME=../binaries/Android/intel/static/vlmcsd-android50-x64-static
 export MULTI_NAME=../binaries/Android/intel/static/vlmcsdmulti-android50-x64-static
 export CC=/opt/toolchains/x86_64-android-21/bin/x86_64-linux-android-gcc
 export CFLAGS="$SMALLCC"
-export PLATFORMFLAGS="-flto=16 -fwhole-program -march=nocona -m64"
+export PLATFORMFLAGS="-flto=16 -fwhole-program -m64"
 export THREADS=0
 export LDFLAGS="$SMALLLD -static"
 

diff --git a/man/vlmcs.1.html b/man/vlmcs.1.html
diff --git a/man/vlmcs.1.pdf b/man/vlmcs.1.pdf
diff --git a/man/vlmcsd-floppy.7.html b/man/vlmcsd-floppy.7.html
diff --git a/man/vlmcsd-floppy.7.pdf b/man/vlmcsd-floppy.7.pdf
diff --git a/man/vlmcsd.7.html b/man/vlmcsd.7.html
diff --git a/man/vlmcsd.7.pdf b/man/vlmcsd.7.pdf
diff --git a/man/vlmcsd.8 b/man/vlmcsd.8
@@ -1,5 +1,5 @@
 .mso www.tmac
-.TH VLMCSD 8 "December 2016" "Hotbird64" "KMS Activation Manual"
+.TH VLMCSD 8 "January 2017" "Hotbird64" "KMS Activation Manual"
 .LO 8
 
 .SH NAME
@@ -92,6 +92,28 @@ You should be aware that only one program can use a VPN adapter at a time. If yo
 
 Example: \fB-O "Ethernet 7"=192.168.123.1/24\fR (uses VPN adapter Ethernet 7 with IPv4 address 192.168.123.1 and have 192.168.123.2 to 192.168.123.254 as additional local (but apparently remote) IPv4 addresses.
 
+.IP "\fB-x0\fR and \fB-x1\fR"
+Controls under what circumstances vlmcsd will exit. Using the default of \fB-x0\fR vlmcsd stays active as long as it can perform some useful operations. If vlmcsd is run by any form of a watchdog, e.g. NT service manager (Windows), systemd (Linux) or launchd (Mac OS / iOS), it may be desirable to end vlmcsd and let the watchdog restart it. This is especially true if some pre-requisites are not yet met but will be some time later, e.g. network is not yet fully setup.
+
+By using \fB-x0\fR vlmcsd will
+
+.RS 12
+exit if none of the listening sockets specified with \fB-L\fR can be used. It continues if at least one socket can be setup for listening.
+
+exit any TAP mirror thread (Windows version only) if there is an error condition while reading or writing from or to the VPN adapter but continue to work without utilizing a VPN adapter.
+.RE
+.IP
+By using \fB-x1\fR vlmcsd will
+
+.RS 12
+exit if not all listening sockets specified with \fB-L\fR can be used.
+
+exit completely if there is a problem with a VPN adapter it is using. This can happen for instance if the VPN adapter has been disabled using "Control Panel - Network - Adapter Settings" while vlmcsd is using it.
+
+.RE
+.IP
+Please note that \fB-x1\fR is kind of a workaround option. While it may help under some circumstances, it is better to solve the problem at its origin, e.g. properly implementing dependencies in your startup script to ensure all network interfaces and the VPN adapter you will use are completely setup before you start vlmcsd.
+
 .IP "\fB-F0\fR and \fB-F1\fR"
 Allow (\fB-F1\fR) or disallow (\fB-F0\fR) binding to IP addresses that are currently not configured on your system. The default is \fB-F0\fR. \fB-F1\fR allows you to bind to an IP address that may be configured after you started \fBvlmcsd\fR. \fBvlmcsd\fR will listen on that address as soon as it becomes available. This feature is only available under Linux (IPv4 and IPv6) and FreeBSD (IPv4 only). FreeBSD allows this feature only for the root user (more correctly: processes that have the PRIV_NETINET_BINDANY privilege). Linux does not require a capability for this.