Index: softether/Makefile
===================================================================
--- softether/Makefile	(revision 414436)
+++ softether/Makefile	(working copy)
@@ -1,12 +1,12 @@
 # $FreeBSD$
 
 PORTNAME=	softether
-PORTVERSION=	4.18.9570
-PORTREVISION=	1
+PORTVERSION=	4.20.9608
 CATEGORIES=	security
-MASTER_SITES=	http://www.softether-download.com/files/softether/v4.18-9570-rtm-2015.07.26-tree/Source_Code/
-DISTNAME=	${PORTNAME}-src-v4.18-9570-rtm
+MASTER_SITES=	http://www.softether-download.com/files/softether/v4.20-9608-rtm-2016.04.17-tree/Source_Code/
 
+DISTNAME=	${PORTNAME}-src-v4.20-9608-rtm
+
 MAINTAINER=	net@arrishq.net
 COMMENT=	Softether VPN solution
 
@@ -23,10 +23,14 @@
 		src/Cedar/Client.h \
 		src/Cedar/Nat.h \
 		src/Cedar/Server.c \
+		src/Cedar/Server.h \
+		src/Cedar/Virtual.h \
 		src/Mayaqua/Cfg.c \
 		src/Mayaqua/Cfg.h \
+		src/Mayaqua/Kernel.c \
+		src/Mayaqua/Mayaqua.c \
 		src/Mayaqua/Network.c \
-		src/Mayaqua/Kernel.c \
+		src/Mayaqua/Network.h \
 		src/Mayaqua/Table.h \
 		src/Mayaqua/Unix.c
 
@@ -36,12 +40,16 @@
 
 USE_OPENSSL=	yes
 USES=		dos2unix gmake iconv:wchar_t ncurses readline
-USE_RC_SUBR=	softether_bridge softether_client softether_server
+USE_RC_SUBR=	softether_client softether_bridge softether_server
 SUB_FILES=	vpncmd
 MAKE_JOBS_UNSAFE=	yes
 
+LOGDIR?=	/var/log/softether
+PLIST_SUB+=	LOGDIR="${LOGDIR}"
+SUB_LIST=	LOGDIR="${LOGDIR}"
+
 # a pity the source directory has such a naming scheme, but well
-WRKSRC=		${WRKDIR}/v4.18-9570
+WRKSRC=		${WRKDIR}/v4.20-9608
 
 ALL_TARGET=	build
 
@@ -80,6 +88,7 @@
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/${i}
 .endfor
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${LOGDIR}
 .for doc in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
Index: softether/distinfo
===================================================================
--- softether/distinfo	(revision 414436)
+++ softether/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (softether-src-v4.18-9570-rtm.tar.gz) = 585d61e524d3cad90806cbeb52ebe54b5144359e6c44676e8e7fb5683ffd4574
-SIZE (softether-src-v4.18-9570-rtm.tar.gz) = 35180998
+SHA256 (softether-src-v4.20-9608-rtm.tar.gz) = e559644e34ec6feba43d99f4083f77f9b082dd0574d0bb1e416a65f32ccbc51e
+SIZE (softether-src-v4.20-9608-rtm.tar.gz) = 33691945
Index: softether/files/patch-src__Cedar__Cedar.h
===================================================================
--- softether/files/patch-src__Cedar__Cedar.h	(revision 414436)
+++ softether/files/patch-src__Cedar__Cedar.h	(working copy)
@@ -1,57 +1,57 @@
---- src/Cedar/Cedar.h.orig	2014-06-08 06:19:15 UTC
-+++ src/Cedar/Cedar.h
-@@ -477,22 +477,22 @@
+--- src/Cedar/Cedar.h.orig	2016-04-21 11:35:52.896232000 +0200
++++ src/Cedar/Cedar.h	2016-04-21 11:35:17.696745000 +0200
+@@ -510,22 +510,22 @@
  #define	LOG_ENGINE_BUFFER_CACHE_SIZE_MAX	(10 * 1024 * 1024)	// Write cache size
  
  // Constant such as a file name
 -#define	SERVER_LOG_DIR_NAME			"@server_log"
-+#define	SERVER_LOG_DIR_NAME			"/var/db/softether/server_log"
++#define	SERVER_LOG_DIR_NAME			"/var/log/softether/server"
  #define	BRIDGE_LOG_DIR_NAME			SERVER_LOG_DIR_NAME
  #define	SERVER_LOG_PERFIX			"vpn"
  
 -#define	HUB_SECURITY_LOG_DIR_NAME	"@security_log"
 -#define	HUB_SECURITY_LOG_FILE_NAME	"@security_log/%s"
-+#define	HUB_SECURITY_LOG_DIR_NAME	"/var/db/softether/security_log"
-+#define	HUB_SECURITY_LOG_FILE_NAME	"/var/db/softether/security_log/%s"
++#define	HUB_SECURITY_LOG_DIR_NAME	"/var/log/softether/security"
++#define	HUB_SECURITY_LOG_FILE_NAME	"/var/log/softether/security/%s"
  #define	HUB_SECURITY_LOG_PREFIX		"sec"
 -#define	HUB_PACKET_LOG_DIR_NAME		"@packet_log"
 -#define	HUB_PACKET_LOG_FILE_NAME	"@packet_log/%s"
-+#define	HUB_PACKET_LOG_DIR_NAME		"/var/db/softether/packet_log"
-+#define	HUB_PACKET_LOG_FILE_NAME	"/var/db/softether/packet_log/%s"
++#define	HUB_PACKET_LOG_DIR_NAME		"/var/log/softether/packet"
++#define	HUB_PACKET_LOG_FILE_NAME	"/var/log/softether/packet/%s"
  #define	HUB_PACKET_LOG_PREFIX		"pkt"
  
 -#define	NAT_LOG_DIR_NAME			"@secure_nat_log"
 -#define	NAT_LOG_FILE_NAME			"@secure_nat_log/%s"
-+#define	NAT_LOG_DIR_NAME			"/var/db/softether/secure_nat_log"
-+#define	NAT_LOG_FILE_NAME			"/var/db/softether/secure_nat_log/%s"
++#define	NAT_LOG_DIR_NAME			"/var/log/softether/secure_nat"
++#define	NAT_LOG_FILE_NAME			"/var/log/softether/secure_nat/%s"
  #define	NAT_LOG_PREFIX				"snat"
  
 -#define	CLIENT_LOG_DIR_NAME			"@client_log"
-+#define	CLIENT_LOG_DIR_NAME			"/var/db/softether/client_log"
++#define	CLIENT_LOG_DIR_NAME			"/var/log/softether/client"
  #define	CLIENT_LOG_PREFIX			"client"
  
  // Packet log settings
-@@ -527,8 +527,8 @@
- #define	DISK_FREE_CHECK_INTERVAL	(5 * 60 * 1000)
+@@ -560,8 +560,8 @@
+ #define	DISK_FREE_CHECK_INTERVAL_DEFAULT	(5 * 60 * 1000)
  
  // Simple log
 -#define TINY_LOG_DIRNAME			"@tiny_log"
 -#define TINY_LOG_FILENAME			"@tiny_log/%04u%02u%02u_%02u%02u%02u.log"
-+#define TINY_LOG_DIRNAME			"/var/db/softether/tiny_log"
-+#define TINY_LOG_FILENAME			"/var/db/softether/tiny_log/%04u%02u%02u_%02u%02u%02u.log"
++#define TINY_LOG_DIRNAME			"/var/log/softether/tiny"
++#define TINY_LOG_FILENAME			"/var/log/softether/tiny/%04u%02u%02u_%02u%02u%02u.log"
  
  
  //////////////////////////////////////////////////////////////////////
-@@ -541,7 +541,7 @@
+@@ -574,7 +574,7 @@
  //#define CE_SNAPSHOT_INTERVAL		((UINT64)(3000))
  #define CE_SNAPSHOT_POLLING_INTERVAL	(1 * 1000)
  #define CE_SNAPSHOT_POLLING_INTERVAL_LICENSE	(30 * 1000)
 -#define CE_SNAPSHOT_DIR_NAME		"@carrier_log"
-+#define CE_SNAPSHOT_DIR_NAME		"/var/db/softether/carrier_log"
++#define CE_SNAPSHOT_DIR_NAME		"/var/log/softether/carrier"
  #define CE_SNAPSHOT_PREFIX			"carrier"
  
  
-@@ -558,7 +558,7 @@
+@@ -591,7 +591,7 @@
  // Expiration date of random size cache
  #define	RAND_SIZE_CACHE_EXPIRE		(24 * 60 * 60 * 1000)
  // Management allowed IP address list file name
@@ -60,7 +60,7 @@
  
  #define NON_SSL_MIN_COUNT			60
  #define NON_SSL_ENTRY_EXPIRES		(10 * 60 * 1000)
-@@ -609,9 +609,9 @@
+@@ -642,9 +642,9 @@
  //////////////////////////////////////////////////////////////////////
  
  #define	EL_ADMIN_PORT			22888
@@ -68,8 +68,8 @@
 -#define	EL_PACKET_LOG_DIR_NAME	"@etherlogger_log"
 -#define	EL_PACKET_LOG_FILE_NAME	"@etherlogger_log/%s"
 +#define	EL_CONFIG_FILENAME		"/var/db/softether/etherlogger.config"
-+#define	EL_PACKET_LOG_DIR_NAME	"/var/db/softether/etherlogger_log"
-+#define	EL_PACKET_LOG_FILE_NAME	"/var/db/softether/etherlogger_log/%s"
++#define	EL_PACKET_LOG_DIR_NAME	"/var/log/softether/etherlogger"
++#define	EL_PACKET_LOG_FILE_NAME	"/var/log/softether/etherlogger/%s"
  #define	EL_PACKET_LOG_PREFIX	"pkt"
  #define	EL_LICENSE_CHECK_SPAN	(10 * 1000)
  
Index: softether/files/patch-src__Cedar__Client.h
===================================================================
--- softether/files/patch-src__Cedar__Client.h	(revision 414436)
+++ softether/files/patch-src__Cedar__Client.h	(working copy)
@@ -1,5 +1,5 @@
---- src/Cedar/Client.h.orig	2014-06-08 06:19:15 UTC
-+++ src/Cedar/Client.h
+--- src/Cedar/Client.h.orig	2016-04-21 11:37:48.434422000 +0200
++++ src/Cedar/Client.h	2016-04-21 11:37:32.295812000 +0200
 @@ -125,7 +125,7 @@
  
  
Index: softether/files/patch-src__Cedar__Nat.h
===================================================================
--- softether/files/patch-src__Cedar__Nat.h	(revision 414436)
+++ softether/files/patch-src__Cedar__Nat.h	(working copy)
@@ -1,5 +1,5 @@
---- src/Cedar/Nat.h.orig	2014-06-08 06:19:15 UTC
-+++ src/Cedar/Nat.h
+--- src/Cedar/Nat.h.orig	2016-04-21 11:38:18.000000000 +0200
++++ src/Cedar/Nat.h	2016-04-21 11:38:34.351169000 +0200
 @@ -115,7 +115,7 @@
  #define	NAT_H
  
Index: softether/files/patch-src__Cedar__Server.c
===================================================================
--- softether/files/patch-src__Cedar__Server.c	(revision 414436)
+++ softether/files/patch-src__Cedar__Server.c	(working copy)
@@ -1,5 +1,5 @@
---- src/Cedar/Server.c.orig	2014-06-08 06:19:15 UTC
-+++ src/Cedar/Server.c
+--- src/Cedar/Server.c.orig	2016-04-21 11:38:18.000000000 +0200
++++ src/Cedar/Server.c	2016-04-21 11:40:28.695678000 +0200
 @@ -115,12 +115,12 @@
  
  static SERVER *server = NULL;
@@ -19,3 +19,12 @@
  
  static bool server_reset_setting = false;
  
+@@ -10916,7 +10916,7 @@
+ #endif	// OS_WIN32
+ 
+ #ifdef	ENABLE_AZURE_SERVER
+-	if (IsFileExists("@azureserver.config"))
++	if (IsFileExists("/var/db/softether/azureserver.config"))
+ 	{
+ 		DisableRDUPServerGlobally();
+ 		s->AzureServer = NewAzureServer(s->Cedar);
Index: softether/files/patch-src__Mayaqua__Cfg.c
===================================================================
--- softether/files/patch-src__Mayaqua__Cfg.c	(revision 414436)
+++ softether/files/patch-src__Mayaqua__Cfg.c	(working copy)
@@ -1,6 +1,6 @@
---- src/Mayaqua/Cfg.c.orig	2014-06-08 06:19:14 UTC
-+++ src/Mayaqua/Cfg.c
-@@ -124,7 +124,7 @@
+--- src/Mayaqua/Cfg.c.orig	2016-04-21 11:32:32.000000000 +0200
++++ src/Mayaqua/Cfg.c	2016-04-21 11:46:23.041271000 +0200
+@@ -139,7 +139,7 @@
  	}
  
  	// Determine the directory name
Index: softether/files/patch-src__Mayaqua__Cfg.h
===================================================================
--- softether/files/patch-src__Mayaqua__Cfg.h	(revision 414436)
+++ softether/files/patch-src__Mayaqua__Cfg.h	(working copy)
@@ -1,6 +1,6 @@
---- src/Mayaqua/Cfg.h.orig	2014-06-08 06:19:14 UTC
-+++ src/Mayaqua/Cfg.h
-@@ -102,7 +102,7 @@
+--- src/Mayaqua/Cfg.h.orig	2016-04-21 11:32:32.000000000 +0200
++++ src/Mayaqua/Cfg.h	2016-04-21 11:46:58.865530000 +0200
+@@ -117,7 +117,7 @@
  // Macro
  //#define	CHECK_CFG_NAME_EXISTS			// Check duplication of the existing name
  
Index: softether/files/patch-src__Mayaqua__Kernel.c
===================================================================
--- softether/files/patch-src__Mayaqua__Kernel.c	(revision 414436)
+++ softether/files/patch-src__Mayaqua__Kernel.c	(working copy)
@@ -1,6 +1,6 @@
---- src/Mayaqua/Kernel.c.orig	2014-06-08 06:19:14 UTC
-+++ src/Mayaqua/Kernel.c
-@@ -2160,7 +2160,7 @@
+--- src/Mayaqua/Kernel.c.orig	2016-04-21 11:32:32.000000000 +0200
++++ src/Mayaqua/Kernel.c	2016-04-21 11:47:38.200923000 +0200
+@@ -2213,7 +2213,7 @@
  		msg = "Unknown Error";
  	}
  
Index: softether/files/patch-src__Mayaqua__Table.h
===================================================================
--- softether/files/patch-src__Mayaqua__Table.h	(revision 414436)
+++ softether/files/patch-src__Mayaqua__Table.h	(working copy)
@@ -1,6 +1,6 @@
---- src/Mayaqua/Table.h.orig	2014-06-08 06:19:14 UTC
-+++ src/Mayaqua/Table.h
-@@ -102,7 +102,7 @@
+--- src/Mayaqua/Table.h.orig	2016-04-21 11:32:32.000000000 +0200
++++ src/Mayaqua/Table.h	2016-04-21 11:50:45.815610000 +0200
+@@ -117,7 +117,7 @@
  #define	UNICODE_CACHE_FILE		L".unicode_cache_%s.dat"
  
  #define	LANGLIST_FILENAME		"|languages.txt"
Index: softether/files/patch-src__Mayaqua__Unix.c
===================================================================
--- softether/files/patch-src__Mayaqua__Unix.c	(revision 414436)
+++ softether/files/patch-src__Mayaqua__Unix.c	(working copy)
@@ -1,6 +1,8 @@
---- src/Mayaqua/Unix.c.orig	2014-06-08 06:19:14 UTC
-+++ src/Mayaqua/Unix.c
-@@ -916,7 +916,7 @@
+--- src/Mayaqua/Unix.c.orig	2016-05-02 19:37:03.000000000 +0200
++++ src/Mayaqua/Unix.c	2016-05-02 19:42:59.886235000 +0200
+--- Unix.c.orig	2016-05-02 19:45:15.568261000 +0200
++++ Unix.c	2016-05-02 19:45:42.378823000 +0200
+@@ -931,7 +931,7 @@
  	GetExeDir(dir, sizeof(dir));
  
  	// File name generation
@@ -9,16 +11,16 @@
  
  	fd = open(name, O_WRONLY);
  	if (fd == -1)
-@@ -2254,7 +2254,7 @@
+@@ -2320,7 +2320,7 @@
  	Hash(hash, exe_name, StrLen(exe_name), false);
  	BinToStr(tmp1, sizeof(tmp1), hash, sizeof(hash));
  
 -	Format(name, size, "%s/.pid_%s", dir, tmp1);
-+	Format(name, size, "/var/db/softether/.pid_%s", tmp1);
++	Format(name, size, "/var/db/softether/%s.pid", tmp1);
  }
  
  // Delete the PID file
-@@ -2299,7 +2299,7 @@
+@@ -2365,7 +2365,7 @@
  	Hash(hash, exe_name, StrLen(exe_name), false);
  	BinToStr(tmp1, sizeof(tmp1), hash, sizeof(hash));
  
Index: softether/pkg-message
===================================================================
--- softether/pkg-message	(revision 414436)
+++ softether/pkg-message	(working copy)
@@ -6,13 +6,13 @@
 To run softether vpn bridge from startup, add
 softether_bridge_enable="YES" in your rc.conf.
 
-To run softether vpn client from startup, add
-softether_client_enable="YES" in your rc.conf.
-
 Initial and further configuration of all softether services can be
 done either by using a Windows client to connect to the running
 services or by vpncmd from command line.
 
+Please note client and brige functionality is right now not fully
+supported on FreeBSD.
+
 When removing SoftEther VPN without the desire to reinstall, please
 ensure to remove the directory /var/db/softether as well.
 
Index: softether/pkg-plist
===================================================================
--- softether/pkg-plist	(revision 414436)
+++ softether/pkg-plist	(working copy)
@@ -5,3 +5,4 @@
 libexec/softether/vpnserver
 sbin/vpncmd
 @dir libexec/softether
+@dir %%LOGDIR%%