Browse Source

merge upstream v4.21-9613-beta

Mykhaylo Yehorov 9 years ago
parent
commit
03ffd7535a

+ 3 - 3
LICENSE

@@ -3,9 +3,9 @@ open-source. You can redistribute them and/or modify them under the terms of
 the GNU General Public License version 2 as published by the Free Software
 Foundation.
 
-Copyright (c) 2012-2015 Daiyuu Nobori.
-Copyright (c) 2012-2015 SoftEther Project at University of Tsukuba, Japan.
-Copyright (c) 2012-2015 SoftEther Corporation.
+Copyright (c) 2012-2016 Daiyuu Nobori.
+Copyright (c) 2012-2016 SoftEther Project at University of Tsukuba, Japan.
+Copyright (c) 2012-2016 SoftEther Corporation.
 All Rights Reserved.
 http://www.softether.org/
 

+ 3 - 3
LICENSE.TXT

@@ -3,9 +3,9 @@ open-source. You can redistribute them and/or modify them under the terms of
 the GNU General Public License version 2 as published by the Free Software
 Foundation.
 
-Copyright (c) 2012-2015 Daiyuu Nobori.
-Copyright (c) 2012-2015 SoftEther Project at University of Tsukuba, Japan.
-Copyright (c) 2012-2015 SoftEther Corporation.
+Copyright (c) 2012-2016 Daiyuu Nobori.
+Copyright (c) 2012-2016 SoftEther Project at University of Tsukuba, Japan.
+Copyright (c) 2012-2016 SoftEther Corporation.
 All Rights Reserved.
 http://www.softether.org/
 

+ 1 - 1
README

@@ -10,7 +10,7 @@ http://www.softether-download.com/
 We accept your patches by the acceptance policy:
 http://www.softether.org/5-download/src/9.patch
 
-Copyright (c) 2012-2015 SoftEther Project at University of Tsukuba, Japan.
+Copyright (c) 2012-2016 SoftEther Project at University of Tsukuba, Japan.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License version 2

+ 1 - 1
README.TXT

@@ -10,7 +10,7 @@ http://www.softether-download.com/
 We accept your patches by the acceptance policy:
 http://www.softether.org/5-download/src/9.patch
 
-Copyright (c) 2012-2015 SoftEther Project at University of Tsukuba, Japan.
+Copyright (c) 2012-2016 SoftEther Project at University of Tsukuba, Japan.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License version 2

+ 2 - 2
centos/SOURCES/linux_32bit.mak

@@ -1,7 +1,7 @@
 # SoftEther VPN Source Code
 # 
-# Copyright (c) 2012-2015 SoftEther VPN Project at University of Tsukuba, Japan.
-# Copyright (c) 2012-2015 Daiyuu Nobori.
+# Copyright (c) 2012-2016 SoftEther VPN Project at University of Tsukuba, Japan.
+# Copyright (c) 2012-2016 Daiyuu Nobori.
 # All Rights Reserved.
 # 
 # http://www.softether.org/

+ 2 - 2
centos/SOURCES/linux_64bit.mak

@@ -1,7 +1,7 @@
 # SoftEther VPN Source Code
 # 
-# Copyright (c) 2012-2015 SoftEther VPN Project at University of Tsukuba, Japan.
-# Copyright (c) 2012-2015 Daiyuu Nobori.
+# Copyright (c) 2012-2016 SoftEther VPN Project at University of Tsukuba, Japan.
+# Copyright (c) 2012-2016 Daiyuu Nobori.
 # All Rights Reserved.
 # 
 # http://www.softether.org/

+ 23 - 0
src/BuildUtil/UnixBuildSoftwares.cs

@@ -690,7 +690,30 @@ namespace BuildUtil
 #else
 			sr.WriteLine("\t@echo \"And please execute './vpncmd' to run the SoftEther VPN Command-Line Utility to configure {0}.\"", BuildHelper.GetSoftwareTitle(this.Software));
 #endif
+			sr.WriteLine("\t@echo");
+#if !BU_SOFTETHER
 			sr.WriteLine("\t@echo \"Of course, you can use the VPN Server Manager GUI Application for Windows on the other Windows PC in order to configure the {0} remotely.\"", BuildHelper.GetSoftwareTitle(this.Software));
+#else
+			sr.WriteLine("\t@echo \"Of course, you can use the VPN Server Manager GUI Application for Windows / Mac OS X on the other Windows / Mac OS X computers in order to configure the {0} remotely.\"", BuildHelper.GetSoftwareTitle(this.Software));
+#endif
+
+#if !BU_SOFTETHER
+#else
+			sr.WriteLine("\t@echo");
+			sr.WriteLine("\t@echo");
+			sr.WriteLine("\t@echo \"*** For Windows users ***\"");
+			sr.WriteLine("\t@echo \"You can download the SoftEther VPN Server Manager for Windows\"");
+			sr.WriteLine("\t@echo \"from the http://www.softether-download.com/ web site.\"");
+			sr.WriteLine("\t@echo \"This manager application helps you to completely and easily manage the VPN server services running in remote hosts.\"");
+			sr.WriteLine("\t@echo");
+			sr.WriteLine("\t@echo");
+			sr.WriteLine("\t@echo \"*** For Mac OS X users ***\"");
+			sr.WriteLine("\t@echo \"In April 2016 we released the SoftEther VPN Server Manager for Mac OS X.\"");
+			sr.WriteLine("\t@echo \"You can download it from the http://www.softether-download.com/ web site.\"");
+			sr.WriteLine("\t@echo \"VPN Server Manager for Mac OS X works perfectly as same as the traditional Windows versions. It helps you to completely and easily manage the VPN server services running in remote hosts.\"");
+			sr.WriteLine("\t@echo");
+#endif
+
 
 			sr.WriteLine("\t@echo \"--------------------------------------------------------------------\"");
 			sr.WriteLine("\t@echo");

+ 6 - 6
src/Cedar/Cedar.h

@@ -135,10 +135,10 @@
 
 
 // Version number
-#define	CEDAR_VER					420
+#define	CEDAR_VER					421
 
 // Build Number
-#define	CEDAR_BUILD					9608
+#define	CEDAR_BUILD					9613
 
 // Beta number
 //#define	BETA_NUMBER					3
@@ -159,10 +159,10 @@
 // Specifies the build date
 #define	BUILD_DATE_Y		2016
 #define	BUILD_DATE_M		4
-#define	BUILD_DATE_D		17
-#define	BUILD_DATE_HO		20
-#define	BUILD_DATE_MI		58
-#define	BUILD_DATE_SE		26
+#define	BUILD_DATE_D		24
+#define	BUILD_DATE_HO		15
+#define	BUILD_DATE_MI		39
+#define	BUILD_DATE_SE		17
 
 // Tolerable time difference
 #define	ALLOW_TIMESTAMP_DIFF		(UINT64)(3 * 24 * 60 * 60 * 1000)

+ 33 - 1
src/Cedar/Command.c

@@ -1331,6 +1331,27 @@ void TtsWorkerThread(THREAD *thread, void *param)
 						{
 							ret = Recv(ts->Sock, recv_buf_data, buf_size, false);
 						}
+
+						if (ts->FirstSendTick == 0)
+						{
+							ts->FirstSendTick = now;
+						}
+						else
+						{
+							if (ts->FirstSendTick <= now)
+							{
+								if (ts->Span != 0)
+								{
+									UINT64 giveup_tick = ts->FirstSendTick + ts->Span * 3ULL + 180000ULL;
+
+									if (now > giveup_tick)
+									{
+										ret = 0;
+									}
+								}
+							}
+						}
+
 						break;
 
 					case 3:
@@ -1757,6 +1778,7 @@ void TtcThread(THREAD *thread, void *param)
 	bool ok = false;
 	UINT buf_size;
 	UCHAR *send_buf_data, *recv_buf_data;
+	IP ip_ret;
 	// Validate arguments
 	if (thread == NULL || param == NULL)
 	{
@@ -1786,10 +1808,13 @@ void TtcThread(THREAD *thread, void *param)
 
 	ok = true;
 
+	Zero(&ip_ret, sizeof(ip_ret));
+
 	for (i = 0;i < ttc->NumTcp;i++)
 	{
 		SOCK *s;
 		TTC_SOCK *ts = ZeroMalloc(sizeof(TTC_SOCK));
+		char target_host[MAX_SIZE];
 
 		ts->Id = i + 1;
 
@@ -1806,7 +1831,14 @@ void TtcThread(THREAD *thread, void *param)
 			ts->Download = ((i % 2) == 0) ? true : false;
 		}
 
-		s = ConnectEx2(ttc->Host, ttc->Port, 0, ttc->Cancel);
+		StrCpy(target_host, sizeof(target_host), ttc->Host);
+
+		if (IsZeroIp(&ip_ret) == false)
+		{
+			IPToStr(target_host, sizeof(target_host), &ip_ret);
+		}
+
+		s = ConnectEx4(target_host, ttc->Port, 0, ttc->Cancel, NULL, NULL, false, false, true, &ip_ret);
 
 		if (s == NULL)
 		{

+ 1 - 0
src/Cedar/Command.h

@@ -202,6 +202,7 @@ struct TTS_SOCK
 	UINT64 SessionId;		// Session ID
 	bool NoMoreSendData;	// Flag not to send more data
 	UINT64 FirstRecvTick;	// Time which the data has been received last
+	UINT64 FirstSendTick;	// Time which the data has been sent last
 	UINT64 Span;			// Period
 };
 

+ 20 - 2
src/Cedar/SM.c

@@ -16557,6 +16557,11 @@ void SmSaveKeyPairDlgInit(HWND hWnd, SM_SAVE_KEY_PAIR *s)
 		Check(hWnd, R_X509_AND_KEY, true);
 	}
 
+	if (MsIsWine())
+	{
+		Disable(hWnd, R_SECURE);
+	}
+
 	SmSaveKeyPairDlgUpdate(hWnd, s);
 }
 
@@ -19350,8 +19355,13 @@ ENTER_PASSWORD:
 	Enable(hWnd, IDOK);
 	Enable(hWnd, B_ABOUT);
 	Enable(hWnd, IDCANCEL);
-	Enable(hWnd, B_SECURE_MANAGER);
-	Enable(hWnd, B_SELECT_SECURE);
+
+	if (MsIsWine() == false)
+	{
+		Enable(hWnd, B_SECURE_MANAGER);
+		Enable(hWnd, B_SELECT_SECURE);
+	}
+
 	Enable(hWnd, B_CERT_TOOL);
 }
 
@@ -20150,6 +20160,12 @@ void SmMainDlgInit(HWND hWnd)
 
 	DlgFont(hWnd, IDOK, 10, true);
 
+	if (MsIsWine())
+	{
+		Disable(hWnd, B_SECURE_MANAGER);
+		Disable(hWnd, B_SELECT_SECURE);
+	}
+
 	Focus(hWnd, L_SETTING);
 
 	SmMainDlgUpdate(hWnd);
@@ -20479,6 +20495,8 @@ void SmMainDlg()
 // Server Manager main process
 void MainSM()
 {
+//	MsgBoxEx(NULL, 0, L"MsIsWine: %u\n", MsIsWine());
+
 	if (sm->TempSetting == NULL)
 	{
 		// Open the main window

+ 58 - 1
src/Cedar/WinUi.c

@@ -462,6 +462,10 @@ WINUI_UPDATE *InitUpdateUi(wchar_t *title, char *name, char *family_name, UINT64
 	{
 		return NULL;
 	}
+	if (MsIsWine())
+	{
+		return false;
+	}
 	if (IsEmptyStr(family_name))
 	{
 		family_name = UPDATE_FAMILY_NAME;
@@ -3143,9 +3147,57 @@ void InitDialogInternational(HWND hWnd, void *pparam)
 
 		if (hControl != NULL)
 		{
+			bool set_font = true;
 			HFONT hFont = GetDialogDefaultFontEx(param && ((DIALOG_PARAM *)param)->meiryo);
 
-			SetFont(hControl, 0, hFont);
+			if (MsIsWine())
+			{
+				char classname[MAX_PATH];
+				char parent_classname[MAX_PATH];
+				HWND hParent = GetParent(hControl);
+
+				Zero(classname, sizeof(classname));
+				Zero(parent_classname, sizeof(parent_classname));
+
+				GetClassNameA(hControl, classname, sizeof(classname));
+
+				if (hParent != NULL)
+				{
+					GetClassNameA(hParent, parent_classname, sizeof(parent_classname));
+				}
+
+				if (StrCmpi(classname, "edit") == 0)
+				{
+					set_font = false;
+				}
+
+				if (StrCmpi(classname, "combobox") == 0)
+				{
+					set_font = false;
+				}
+
+				if (StrCmpi(classname, "syslistview32") == 0)
+				{
+					set_font = false;
+				}
+
+				if (StrCmpi(classname, "sysheader32") == 0)
+				{
+					set_font = false;
+				}
+
+				if (StrCmpi(parent_classname, "SysIPAddress32") == 0 ||
+					StrCmpi(classname, "SysIPAddress32") == 0)
+				{
+					set_font = true;
+					hFont = GetFont("Tahoma", 8, false, false, false, false);
+				}
+			}
+
+			if (set_font)
+			{
+				SetFont(hControl, 0, hFont);
+			}
 
 			if (MsIsVista())
 			{
@@ -3727,6 +3779,11 @@ void AboutDlgInit(HWND hWnd, WINUI_ABOUT *a)
 
 	SetFont(hWnd, S_INFO3, GetFont("Arial", 7, false, false, false, false));
 
+	if (MsIsWine())
+	{
+		Disable(hWnd, B_LANGUAGE);
+	}
+
 	//DlgFont(hWnd, S_INFO4, 8, false);
 
 	SetShow(hWnd, B_UPDATE_CONFIG, (a->Update != NULL));

+ 4 - 4
src/CurrentBuild.txt

@@ -1,4 +1,4 @@
-BUILD_NUMBER 9608
-VERSION 420
-BUILD_NAME rtm
-BUILD_DATE 20160417_205826
+BUILD_NUMBER 9613
+VERSION 421
+BUILD_NAME beta
+BUILD_DATE 20160424_153917

+ 3 - 3
src/LICENSE.TXT

@@ -3,9 +3,9 @@ open-source. You can redistribute them and/or modify them under the terms of
 the GNU General Public License version 2 as published by the Free Software
 Foundation.
 
-Copyright (c) 2012-2015 Daiyuu Nobori.
-Copyright (c) 2012-2015 SoftEther Project at University of Tsukuba, Japan.
-Copyright (c) 2012-2015 SoftEther Corporation.
+Copyright (c) 2012-2016 Daiyuu Nobori.
+Copyright (c) 2012-2016 SoftEther Project at University of Tsukuba, Japan.
+Copyright (c) 2012-2016 SoftEther Corporation.
 All Rights Reserved.
 http://www.softether.org/
 

+ 46 - 0
src/Mayaqua/Microsoft.c

@@ -8774,6 +8774,7 @@ BOOL CALLBACK EnumChildWindowProc(HWND hWnd, LPARAM lParam)
 	LIST *o;
 	HWND hParent;
 	char c1[MAX_SIZE], c2[MAX_SIZE];
+	bool ok = false;
 	// Validate arguments
 	if (hWnd == NULL || p == NULL)
 	{
@@ -8795,6 +8796,19 @@ BOOL CALLBACK EnumChildWindowProc(HWND hWnd, LPARAM lParam)
 	}
 
 	if (p->include_ipcontrol || (StrCmpi(c1, "SysIPAddress32") != 0 && (IsEmptyStr(c2) || StrCmpi(c2, "SysIPAddress32") != 0)))
+	{
+		ok = true;
+	}
+
+	if (MsIsWine())
+	{
+		if (StrCmpi(c1, "SysIPAddress32") == 0 || StrCmpi(c2, "SysIPAddress32") == 0)
+		{
+			ok = true;
+		}
+	}
+
+	if (ok)
 	{
 		AddWindow(o, hWnd);
 
@@ -12448,6 +12462,33 @@ bool MsIsNt()
 	return ms->IsNt;
 }
 
+// Get whether the current system is WINE
+bool MsIsWine()
+{
+	bool ret = false;
+
+	if (ms == NULL)
+	{
+		HINSTANCE h = LoadLibrary("kernel32.dll");
+
+		if (h != NULL)
+		{
+			if (GetProcAddress(h, "wine_get_unix_file_name") != NULL)
+			{
+				ret = true;
+			}
+
+			FreeLibrary(h);
+		}
+	}
+	else
+	{
+		ret = ms->IsWine;
+	}
+
+	return ret;
+}
+
 // Get whether the current user is an Admin
 bool MsIsAdmin()
 {
@@ -14624,6 +14665,11 @@ void MsInit()
 		ms->IsAdmin = true;
 	}
 
+	if (GetProcAddress(ms->hKernel32, "wine_get_unix_file_name") != NULL)
+	{
+		ms->IsWine = true;
+	}
+
 	// Get information about the current process
 	ms->hCurrentProcess = GetCurrentProcess();
 	ms->CurrentProcessId = GetCurrentProcessId();

+ 2 - 0
src/Mayaqua/Microsoft.h

@@ -400,6 +400,7 @@ typedef struct MS
 	wchar_t *UserNameExW;
 	wchar_t *MinidumpBaseFileNameW;
 	IO *LockFile;
+	bool IsWine;
 } MS;
 
 // For Windows NT API
@@ -732,6 +733,7 @@ bool MsRegUnloadHive(UINT root, wchar_t *keyname);
 
 bool MsIsNt();
 bool MsIsAdmin();
+bool MsIsWine();
 bool MsEnablePrivilege(char *name, bool enable);
 void *MsGetCurrentProcess();
 UINT MsGetCurrentProcessId();

+ 1 - 1
src/Mayaqua/Network.c

@@ -15275,7 +15275,7 @@ SOCK *ConnectEx4(char *hostname, UINT port, UINT timeout, bool *cancel_flag, cha
 			Copy(&ip4, ret_ip, sizeof(IP));
 		}
 
-		Debug("Using cached IP address: %s = %r\n", hostname_original, ret_ip);
+		//Debug("Using cached IP address: %s = %r\n", hostname_original, ret_ip);
 	}
 	else
 	{

+ 7 - 0
src/Mayaqua/Table.c

@@ -562,6 +562,13 @@ LIST *LoadLangList()
 	char *filename = LANGLIST_FILENAME;
 	BUF *b;
 
+#ifdef	OS_WIN32
+	if (MsIsWine())
+	{
+		filename = LANGLIST_FILENAME_WINE;
+	}
+#endif	// OS_WIN32
+
 	b = ReadDump(filename);
 	if (b == NULL)
 	{

+ 2 - 0
src/Mayaqua/Table.h

@@ -117,6 +117,8 @@
 #define	UNICODE_CACHE_FILE		L".unicode_cache_%s.dat"
 
 #define	LANGLIST_FILENAME		"|languages.txt"
+#define	LANGLIST_FILENAME_WINE	"|languages_wine.txt"
+
 #define	LANG_CONFIG_FILENAME	L"@lang.config"
 #define	LANG_CONFIG_TEMPLETE	"|lang.config"
 

+ 3 - 3
src/PenCore/PenCore.rc

@@ -1810,16 +1810,16 @@ FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
     CONTROL         141,IDC_STATIC,"Static",SS_BITMAP,0,0,275,46
     GROUPBOX        "@STATIC1",IDC_STATIC,6,53,261,187
-    ICON            ICO_VPNSERVER,IDC_STATIC,14,67,20,18
+    ICON            ICO_VPNSERVER,IDC_STATIC,14,67,20,20
     LTEXT           "@STATIC2",IDC_STATIC,41,67,218,29
     CONTROL         "",L_SETTING,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_EDITLABELS | WS_BORDER | WS_TABSTOP,15,96,242,96
     PUSHBUTTON      "@B_NEW_SETTING",B_NEW_SETTING,15,197,76,14
     PUSHBUTTON      "@B_EDIT_SETTING",B_EDIT_SETTING,98,197,76,14
     PUSHBUTTON      "@B_DELETE",B_DELETE,181,197,76,14
     PUSHBUTTON      "@IDOK",IDOK,181,217,76,17
-    ICON            ICO_CERT,IDC_STATIC,147,246,20,18
+    ICON            ICO_CERT,IDC_STATIC,147,246,20,20
     PUSHBUTTON      "@B_CERT_TOOL",B_CERT_TOOL,171,248,86,14
-    ICON            ICO_SECURE,IDC_STATIC,45,266,20,18
+    ICON            ICO_SECURE,S_SMARTCARD_ICON,45,266,18,18
     PUSHBUTTON      "@B_SECURE_MANAGER",B_SECURE_MANAGER,67,269,96,14
     PUSHBUTTON      "@B_SELECT_SECURE",B_SELECT_SECURE,171,269,86,14
     PUSHBUTTON      "@B_ABOUT",B_ABOUT,14,288,76,14

+ 2 - 1
src/PenCore/resource.h

@@ -1025,6 +1025,7 @@
 #define S_VGS3                          1514
 #define S_TSUKUBA                       1515
 #define R_DISABLE_NATT                  1516
+#define S_SMARTCARD_ICON                1517
 #define B_ONLINE                        1655
 #define D_NM_CONNECT                    1998
 #define D_NM_MAIN                       1999
@@ -1207,7 +1208,7 @@
 #define _APS_NO_MFC                     1
 #define _APS_NEXT_RESOURCE_VALUE        242
 #define _APS_NEXT_COMMAND_VALUE         40111
-#define _APS_NEXT_CONTROL_VALUE         1517
+#define _APS_NEXT_CONTROL_VALUE         1518
 #define _APS_NEXT_SYMED_VALUE           102
 #endif
 #endif

+ 1 - 1
src/README.TXT

@@ -10,7 +10,7 @@ http://www.softether-download.com/
 We accept your patches by the acceptance policy:
 http://www.softether.org/5-download/src/9.patch
 
-Copyright (c) 2012-2015 SoftEther Project at University of Tsukuba, Japan.
+Copyright (c) 2012-2016 SoftEther Project at University of Tsukuba, Japan.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License version 2

+ 0 - 1
src/SEVPN.sln

@@ -14,7 +14,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "hamcore", "hamcore", "{234994FD-5966-4CFE-AC38-960DE089FBED}"
 	ProjectSection(SolutionItems) = preProject
 		bin\hamcore\lang.config = bin\hamcore\lang.config
-		bin\hamcore\languages.txt = bin\hamcore\languages.txt
 		bin\hamcore\strtable_cn.stb = bin\hamcore\strtable_cn.stb
 		bin\hamcore\strtable_en.stb = bin\hamcore\strtable_en.stb
 		bin\hamcore\strtable_ja.stb = bin\hamcore\strtable_ja.stb

+ 3 - 3
src/bin/hamcore/eula.txt

@@ -1,8 +1,8 @@
 SoftEther VPN Server, Client and Bridge are free software, and released as open-source. You can redistribute them and/or modify them under the terms of the GNU General Public License version 2 as published by the Free Software Foundation.
 
-Copyright (c) 2012-2015 Daiyuu Nobori.
-Copyright (c) 2012-2015 SoftEther Project at University of Tsukuba, Japan.
-Copyright (c) 2012-2015 SoftEther Corporation.
+Copyright (c) 2012-2016 Daiyuu Nobori.
+Copyright (c) 2012-2016 SoftEther Project at University of Tsukuba, Japan.
+Copyright (c) 2012-2016 SoftEther Corporation.
 All Rights Reserved.
 http://www.softether.org/
 

+ 6 - 0
src/bin/hamcore/languages_wine.txt

@@ -0,0 +1,6 @@
+# PacketiX VPN / SoftEther VPN Language List File
+# Copyright (c) SoftEther Corporation. All Rights Reserved
+
+# 番号 識別子 英語表記 ローカル表記 Windowsロケール番号 UNIXロケール文字一覧
+1 en English English 1033 en,us,c
+

BIN
src/bin/vpnweb.cab


BIN
src/bin/vpnweb.ocx


File diff suppressed because it is too large
+ 0 - 0
src/makefiles/freebsd_32bit.mak


File diff suppressed because it is too large
+ 0 - 0
src/makefiles/freebsd_64bit.mak


File diff suppressed because it is too large
+ 0 - 0
src/makefiles/linux_32bit.mak


File diff suppressed because it is too large
+ 0 - 0
src/makefiles/linux_64bit.mak


File diff suppressed because it is too large
+ 0 - 0
src/makefiles/macos_32bit.mak


File diff suppressed because it is too large
+ 0 - 0
src/makefiles/macos_64bit.mak


File diff suppressed because it is too large
+ 0 - 0
src/makefiles/openbsd_32bit.mak


File diff suppressed because it is too large
+ 0 - 0
src/makefiles/openbsd_64bit.mak


File diff suppressed because it is too large
+ 0 - 0
src/makefiles/solaris_32bit.mak


File diff suppressed because it is too large
+ 0 - 0
src/makefiles/solaris_64bit.mak


+ 1 - 1
src/vpnweb/vpnweb.h

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 7.00.0500 */
-/* at Sun Apr 17 20:58:41 2016
+/* at Sun Apr 24 15:39:30 2016
  */
 /* Compiler settings for .\vpnweb.idl:
     Oicf, W1, Zp8, env=Win32 (32b run)

+ 1 - 1
src/vpnweb/vpnweb_i.c

@@ -6,7 +6,7 @@
 
 
  /* File created by MIDL compiler version 7.00.0500 */
-/* at Sun Apr 17 20:58:41 2016
+/* at Sun Apr 24 15:39:30 2016
  */
 /* Compiler settings for .\vpnweb.idl:
     Oicf, W1, Zp8, env=Win32 (32b run)

+ 1 - 1
src/vpnweb/vpnweb_p.c

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 7.00.0500 */
-/* at Sun Apr 17 20:58:41 2016
+/* at Sun Apr 24 15:39:30 2016
  */
 /* Compiler settings for .\vpnweb.idl:
     Oicf, W1, Zp8, env=Win32 (32b run)

Some files were not shown because too many files changed in this diff