diff options
| author | dnobori <da.git@softether.co.jp> | 2017-10-18 12:24:21 +0300 |
|---|---|---|
| committer | dnobori <da.git@softether.co.jp> | 2017-10-18 12:24:21 +0300 |
| commit | faee11ff096e7950b006ef1ae8dc636b6fe0131e (patch) | |
| tree | 521b08a96b0b4b433537b9bf37f827c976cd4007 | |
| parent | acf49ad536c55a51a1d19b4529a8e804f738c739 (diff) | |
v4.23-9647-betav4.23-9647-beta
301 files changed, 1683 insertions, 2633 deletions
diff --git a/AUTHORS.TXT b/AUTHORS.TXT index 8a1f2561..44fdbcfd 100644 --- a/AUTHORS.TXT +++ b/AUTHORS.TXT @@ -6,7 +6,7 @@ AUTHORS OF SOFTETHER VPN CORE DEVELOPERS:
- - Daiyuu Nobori
+ - Daiyuu Nobori, Ph.D.
Computer Science, Graduate School of University of Tsukuba
SoftEther Corporation
E-mail: daiyuu-nobori [at] softether.org
@@ -18,16 +18,16 @@ CORE DEVELOPERS: Risk Engineering, Graduate School of University of Tsukuba
SoftEther Corporation
- - Takao Ito
+ - Takao Ito, Ph.D.
Computer Science, Graduate School of University of Tsukuba
SoftEther Corporation
+ - Mei Sharie Ann Yamaguchi, Ph.D.
+ Life and Environmental Sciences, Graduate School of University of Tsukuba
+
- Christopher Smith
College of Information Science, University of Tsukuba
- - Mei Sharie Ann Yamaguchi
- Life and Environmental Sciences, Graduate School of University of Tsukuba
-
WEB-SITE DESIGNER:
@@ -118,6 +118,26 @@ CONTRIBUTORS on GitHub: - Sacha Bernstein
https://github.com/sacha
+ - cm0x4D
+ https://github.com/cm0x4D
+
+ - DDGo
+ https://github.com/DDGo
+
+ - Noah O'Donoghue
+ https://github.com/NoahO
+
+ - Moataz Elmasry
+ https://github.com/moatazelmasry2
+
+ - Zulyandri Zardi
+ https://github.com/zulzardi
+
+ - rel22
+ https://github.com/rel22
+
+ - Guanzhong Chen
+ https://github.com/quantum5
JOIN THE SOFTETHER VPN DEVELOPMENT
----------------------------------
@@ -127,8 +147,3 @@ Want to become a contributor? Please send us a patch. See also: SoftEther VPN Patch Acceptance Policy
http://www.softether.org/5-download/src/9.patch
-
-Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-Department of Computer Science has dozens of overly-enthusiastic geeks.
-Join us: http://www.tsukuba.ac.jp/english/admission/
-
@@ -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-2016 Daiyuu Nobori.
-Copyright (c) 2012-2016 SoftEther Project at University of Tsukuba, Japan.
-Copyright (c) 2012-2016 SoftEther Corporation.
+Copyright (c) Daiyuu Nobori.
+Copyright (c) SoftEther Project at University of Tsukuba, Japan.
+Copyright (c) SoftEther Corporation.
All Rights Reserved.
http://www.softether.org/
diff --git a/LICENSE.TXT b/LICENSE.TXT index fe75456e..a93edd01 100644 --- a/LICENSE.TXT +++ b/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-2016 Daiyuu Nobori.
-Copyright (c) 2012-2016 SoftEther Project at University of Tsukuba, Japan.
-Copyright (c) 2012-2016 SoftEther Corporation.
+Copyright (c) Daiyuu Nobori.
+Copyright (c) SoftEther Project at University of Tsukuba, Japan.
+Copyright (c) SoftEther Corporation.
All Rights Reserved.
http://www.softether.org/
@@ -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-2016 SoftEther Project at University of Tsukuba, Japan.
+Copyright (c) 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
@@ -123,24 +123,9 @@ on all the following open-source repositories: - GitHub
https://github.com/SoftEtherVPN/SoftEtherVPN/
- - SourceForge
- https://sourceforge.net/p/softethervpn/code/ci/master/tree/
-
- - Google Code
- https://code.google.com/p/softether/source/browse/
-
-
To fetch the source code from GitHub:
$ git clone https://github.com/SoftEtherVPN/SoftEtherVPN.git
-To fetch the source code from SourceForge:
-$ git clone http://git.code.sf.net/p/softethervpn/code
- - or -
-$ git clone git://git.code.sf.net/p/softethervpn/code
-
-To fetch the source code from Google Code:
-$ git clone https://code.google.com/p/softether/
-
We hope that you can reach one of the above URLs at least!
@@ -218,10 +203,3 @@ SOME SOFTWARE PROGRAMS FROM THIRD PARTIES ARE INCLUDED ON THIS SOFTWARE WITH LICENSE CONDITIONS WHICH ARE DESCRIBED ON THE 'THIRD_PARTY.TXT' FILE.
-ADVERTISEMENT
--------------
-
-SoftEther VPN is developed by SoftEther VPN Project at University of Tsukuba.
-Department of Computer Science has dozens of overly-enthusiastic geeks.
-Join us: http://www.tsukuba.ac.jp/english/admission/
-
@@ -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-2016 SoftEther Project at University of Tsukuba, Japan.
+Copyright (c) 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
@@ -123,24 +123,9 @@ on all the following open-source repositories: - GitHub
https://github.com/SoftEtherVPN/SoftEtherVPN/
- - SourceForge
- https://sourceforge.net/p/softethervpn/code/ci/master/tree/
-
- - Google Code
- https://code.google.com/p/softether/source/browse/
-
-
To fetch the source code from GitHub:
$ git clone https://github.com/SoftEtherVPN/SoftEtherVPN.git
-To fetch the source code from SourceForge:
-$ git clone http://git.code.sf.net/p/softethervpn/code
- - or -
-$ git clone git://git.code.sf.net/p/softethervpn/code
-
-To fetch the source code from Google Code:
-$ git clone https://code.google.com/p/softether/
-
We hope that you can reach one of the above URLs at least!
@@ -218,10 +203,3 @@ SOME SOFTWARE PROGRAMS FROM THIRD PARTIES ARE INCLUDED ON THIS SOFTWARE WITH LICENSE CONDITIONS WHICH ARE DESCRIBED ON THE 'THIRD_PARTY.TXT' FILE.
-ADVERTISEMENT
--------------
-
-SoftEther VPN is developed by SoftEther VPN Project at University of Tsukuba.
-Department of Computer Science has dozens of overly-enthusiastic geeks.
-Join us: http://www.tsukuba.ac.jp/english/admission/
-
diff --git a/centos/SOURCES/linux_32bit.mak b/centos/SOURCES/linux_32bit.mak index 3f1cab3d..684b8ab1 100644 --- a/centos/SOURCES/linux_32bit.mak +++ b/centos/SOURCES/linux_32bit.mak @@ -1,7 +1,7 @@ # SoftEther VPN Source Code # -# Copyright (c) 2012-2016 SoftEther VPN Project at University of Tsukuba, Japan. -# Copyright (c) 2012-2016 Daiyuu Nobori. +# Copyright (c) SoftEther VPN Project at University of Tsukuba, Japan. +# Copyright (c) Daiyuu Nobori. # All Rights Reserved. # # http://www.softether.org/ diff --git a/centos/SOURCES/linux_64bit.mak b/centos/SOURCES/linux_64bit.mak index 8e8c4942..f6550719 100644 --- a/centos/SOURCES/linux_64bit.mak +++ b/centos/SOURCES/linux_64bit.mak @@ -1,7 +1,7 @@ # SoftEther VPN Source Code # -# Copyright (c) 2012-2016 SoftEther VPN Project at University of Tsukuba, Japan. -# Copyright (c) 2012-2016 Daiyuu Nobori. +# Copyright (c) SoftEther VPN Project at University of Tsukuba, Japan. +# Copyright (c) Daiyuu Nobori. # All Rights Reserved. # # http://www.softether.org/ diff --git a/src/BuildFiles/Library/Win32_Debug/libeay32.lib b/src/BuildFiles/Library/Win32_Debug/libeay32.lib Binary files differindex 9313d9cf..cf203711 100644 --- a/src/BuildFiles/Library/Win32_Debug/libeay32.lib +++ b/src/BuildFiles/Library/Win32_Debug/libeay32.lib diff --git a/src/BuildFiles/Library/Win32_Debug/libssl32.lib b/src/BuildFiles/Library/Win32_Debug/libssl32.lib Binary files differdeleted file mode 100644 index 31d459b5..00000000 --- a/src/BuildFiles/Library/Win32_Debug/libssl32.lib +++ /dev/null diff --git a/src/BuildFiles/Library/Win32_Debug/ssleay32.lib b/src/BuildFiles/Library/Win32_Debug/ssleay32.lib Binary files differindex 3f81a68b..7ebbc494 100644 --- a/src/BuildFiles/Library/Win32_Debug/ssleay32.lib +++ b/src/BuildFiles/Library/Win32_Debug/ssleay32.lib diff --git a/src/BuildFiles/Library/Win32_Release/libeay32.lib b/src/BuildFiles/Library/Win32_Release/libeay32.lib Binary files differindex c3a0084f..84e322db 100644 --- a/src/BuildFiles/Library/Win32_Release/libeay32.lib +++ b/src/BuildFiles/Library/Win32_Release/libeay32.lib diff --git a/src/BuildFiles/Library/Win32_Release/libssl32.lib b/src/BuildFiles/Library/Win32_Release/libssl32.lib Binary files differdeleted file mode 100644 index 838f7328..00000000 --- a/src/BuildFiles/Library/Win32_Release/libssl32.lib +++ /dev/null diff --git a/src/BuildFiles/Library/Win32_Release/ssleay32.lib b/src/BuildFiles/Library/Win32_Release/ssleay32.lib Binary files differindex 1e100612..53b98f42 100644 --- a/src/BuildFiles/Library/Win32_Release/ssleay32.lib +++ b/src/BuildFiles/Library/Win32_Release/ssleay32.lib diff --git a/src/BuildFiles/Library/x64_Debug/libeay32.lib b/src/BuildFiles/Library/x64_Debug/libeay32.lib Binary files differindex 5497e997..ccc2f69d 100644 --- a/src/BuildFiles/Library/x64_Debug/libeay32.lib +++ b/src/BuildFiles/Library/x64_Debug/libeay32.lib diff --git a/src/BuildFiles/Library/x64_Debug/libssl32.lib b/src/BuildFiles/Library/x64_Debug/libssl32.lib Binary files differdeleted file mode 100644 index 69e8e09c..00000000 --- a/src/BuildFiles/Library/x64_Debug/libssl32.lib +++ /dev/null diff --git a/src/BuildFiles/Library/x64_Debug/ssleay32.lib b/src/BuildFiles/Library/x64_Debug/ssleay32.lib Binary files differindex 0c496569..1327f4eb 100644 --- a/src/BuildFiles/Library/x64_Debug/ssleay32.lib +++ b/src/BuildFiles/Library/x64_Debug/ssleay32.lib diff --git a/src/BuildFiles/Library/x64_Release/libeay32.lib b/src/BuildFiles/Library/x64_Release/libeay32.lib Binary files differindex f7aba878..a3c712b6 100644 --- a/src/BuildFiles/Library/x64_Release/libeay32.lib +++ b/src/BuildFiles/Library/x64_Release/libeay32.lib diff --git a/src/BuildFiles/Library/x64_Release/libssl32.lib b/src/BuildFiles/Library/x64_Release/libssl32.lib Binary files differdeleted file mode 100644 index 5ef3a2f9..00000000 --- a/src/BuildFiles/Library/x64_Release/libssl32.lib +++ /dev/null diff --git a/src/BuildFiles/Library/x64_Release/ssleay32.lib b/src/BuildFiles/Library/x64_Release/ssleay32.lib Binary files differindex c78ea1f3..5451fbee 100644 --- a/src/BuildFiles/Library/x64_Release/ssleay32.lib +++ b/src/BuildFiles/Library/x64_Release/ssleay32.lib diff --git a/src/BuildUtil/BuildUtilCommands.cs b/src/BuildUtil/BuildUtilCommands.cs index 578f7f07..8d008f63 100644 --- a/src/BuildUtil/BuildUtilCommands.cs +++ b/src/BuildUtil/BuildUtilCommands.cs @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1346,7 +1346,3 @@ namespace BuildUtil }
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/BuildUtilMain.cs b/src/BuildUtil/BuildUtilMain.cs index 6a72fa71..722f6942 100644 --- a/src/BuildUtil/BuildUtilMain.cs +++ b/src/BuildUtil/BuildUtilMain.cs @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -217,7 +217,3 @@ namespace BuildUtil }
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/CodeSign.cs b/src/BuildUtil/CodeSign.cs index 76a8c7ba..b51920d4 100644 --- a/src/BuildUtil/CodeSign.cs +++ b/src/BuildUtil/CodeSign.cs @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -299,7 +299,3 @@ namespace BuildUtil }
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/CoreUtil/Bmp.cs b/src/BuildUtil/CoreUtil/Bmp.cs index c188c0e5..4afcd2e4 100644 --- a/src/BuildUtil/CoreUtil/Bmp.cs +++ b/src/BuildUtil/CoreUtil/Bmp.cs @@ -212,7 +212,3 @@ namespace CoreUtil }
}
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/CoreUtil/Buf.cs b/src/BuildUtil/CoreUtil/Buf.cs index a14da441..8aa4e4f4 100644 --- a/src/BuildUtil/CoreUtil/Buf.cs +++ b/src/BuildUtil/CoreUtil/Buf.cs @@ -697,7 +697,3 @@ namespace CoreUtil }
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/CoreUtil/Cache.cs b/src/BuildUtil/CoreUtil/Cache.cs index 85d653af..d8a5c37f 100644 --- a/src/BuildUtil/CoreUtil/Cache.cs +++ b/src/BuildUtil/CoreUtil/Cache.cs @@ -344,7 +344,3 @@ namespace CoreUtil }
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/CoreUtil/Compress.cs b/src/BuildUtil/CoreUtil/Compress.cs index f3bdf872..8ba48f30 100644 --- a/src/BuildUtil/CoreUtil/Compress.cs +++ b/src/BuildUtil/CoreUtil/Compress.cs @@ -206,7 +206,3 @@ namespace CoreUtil }
}
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/CoreUtil/Console.cs b/src/BuildUtil/CoreUtil/Console.cs index 2997266f..07204d13 100644 --- a/src/BuildUtil/CoreUtil/Console.cs +++ b/src/BuildUtil/CoreUtil/Console.cs @@ -2204,7 +2204,3 @@ namespace CoreUtil }
}
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/CoreUtil/Csv.cs b/src/BuildUtil/CoreUtil/Csv.cs index a67fc8cd..8147cd4e 100644 --- a/src/BuildUtil/CoreUtil/Csv.cs +++ b/src/BuildUtil/CoreUtil/Csv.cs @@ -521,7 +521,3 @@ namespace CoreUtil }
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/CoreUtil/Env.cs b/src/BuildUtil/CoreUtil/Env.cs index a75611d9..38be4707 100644 --- a/src/BuildUtil/CoreUtil/Env.cs +++ b/src/BuildUtil/CoreUtil/Env.cs @@ -596,7 +596,3 @@ namespace CoreUtil }
}
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/CoreUtil/FileIO.cs b/src/BuildUtil/CoreUtil/FileIO.cs index d5d47a6b..52787a5f 100644 --- a/src/BuildUtil/CoreUtil/FileIO.cs +++ b/src/BuildUtil/CoreUtil/FileIO.cs @@ -1726,7 +1726,3 @@ namespace CoreUtil }
}
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/CoreUtil/GZip.cs b/src/BuildUtil/CoreUtil/GZip.cs index f775a75f..e3eecd42 100644 --- a/src/BuildUtil/CoreUtil/GZip.cs +++ b/src/BuildUtil/CoreUtil/GZip.cs @@ -257,7 +257,3 @@ namespace CoreUtil }
}
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/CoreUtil/Kernel.cs b/src/BuildUtil/CoreUtil/Kernel.cs index a52c5019..19dbaf87 100644 --- a/src/BuildUtil/CoreUtil/Kernel.cs +++ b/src/BuildUtil/CoreUtil/Kernel.cs @@ -194,7 +194,3 @@ namespace CoreUtil }
}
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/CoreUtil/MultiLang.cs b/src/BuildUtil/CoreUtil/MultiLang.cs index b45abc42..e938e5fa 100644 --- a/src/BuildUtil/CoreUtil/MultiLang.cs +++ b/src/BuildUtil/CoreUtil/MultiLang.cs @@ -963,7 +963,3 @@ public class MultiLanguageFilterStream : Stream }
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/CoreUtil/Packer.cs b/src/BuildUtil/CoreUtil/Packer.cs index 4ea38eaa..7818df18 100644 --- a/src/BuildUtil/CoreUtil/Packer.cs +++ b/src/BuildUtil/CoreUtil/Packer.cs @@ -226,7 +226,3 @@ namespace CoreUtil }
}
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/CoreUtil/RC4.cs b/src/BuildUtil/CoreUtil/RC4.cs index 824f9bec..c14b18c5 100644 --- a/src/BuildUtil/CoreUtil/RC4.cs +++ b/src/BuildUtil/CoreUtil/RC4.cs @@ -249,7 +249,3 @@ namespace CoreUtil }
}
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/CoreUtil/ReadIni.cs b/src/BuildUtil/CoreUtil/ReadIni.cs index f8d27ca7..b50a2249 100644 --- a/src/BuildUtil/CoreUtil/ReadIni.cs +++ b/src/BuildUtil/CoreUtil/ReadIni.cs @@ -330,7 +330,3 @@ namespace CoreUtil }
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/CoreUtil/Reg.cs b/src/BuildUtil/CoreUtil/Reg.cs index a98ca716..85df9fba 100644 --- a/src/BuildUtil/CoreUtil/Reg.cs +++ b/src/BuildUtil/CoreUtil/Reg.cs @@ -561,7 +561,3 @@ namespace CoreUtil }
}
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/CoreUtil/Secure.cs b/src/BuildUtil/CoreUtil/Secure.cs index 087d9c06..457ce1fc 100644 --- a/src/BuildUtil/CoreUtil/Secure.cs +++ b/src/BuildUtil/CoreUtil/Secure.cs @@ -1053,7 +1053,3 @@ namespace CoreUtil }
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/CoreUtil/Stb.cs b/src/BuildUtil/CoreUtil/Stb.cs index 32ccc062..3c4c88a7 100644 --- a/src/BuildUtil/CoreUtil/Stb.cs +++ b/src/BuildUtil/CoreUtil/Stb.cs @@ -376,7 +376,3 @@ namespace CoreUtil }
}
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/CoreUtil/Str.cs b/src/BuildUtil/CoreUtil/Str.cs index 3f5d56e5..8d1f16b4 100644 --- a/src/BuildUtil/CoreUtil/Str.cs +++ b/src/BuildUtil/CoreUtil/Str.cs @@ -4401,7 +4401,3 @@ namespace CoreUtil }
}
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/CoreUtil/Tar.cs b/src/BuildUtil/CoreUtil/Tar.cs index 3b64fa44..0c4dd877 100644 --- a/src/BuildUtil/CoreUtil/Tar.cs +++ b/src/BuildUtil/CoreUtil/Tar.cs @@ -454,7 +454,3 @@ namespace CoreUtil }
}
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/CoreUtil/Thread.cs b/src/BuildUtil/CoreUtil/Thread.cs index e8dd1a1a..19c1ffb1 100644 --- a/src/BuildUtil/CoreUtil/Thread.cs +++ b/src/BuildUtil/CoreUtil/Thread.cs @@ -566,7 +566,3 @@ namespace CoreUtil }
}
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/CoreUtil/Time.cs b/src/BuildUtil/CoreUtil/Time.cs index 7aa28cd5..d1d5b0a2 100644 --- a/src/BuildUtil/CoreUtil/Time.cs +++ b/src/BuildUtil/CoreUtil/Time.cs @@ -198,7 +198,3 @@ namespace CoreUtil }
}
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/CoreUtil/Util.cs b/src/BuildUtil/CoreUtil/Util.cs index a1c2c645..19c094f0 100644 --- a/src/BuildUtil/CoreUtil/Util.cs +++ b/src/BuildUtil/CoreUtil/Util.cs @@ -1058,7 +1058,3 @@ namespace CoreUtil public string XsdFileName;
}
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/CoreUtil/Win32.cs b/src/BuildUtil/CoreUtil/Win32.cs index 32afefcf..f8727a4f 100644 --- a/src/BuildUtil/CoreUtil/Win32.cs +++ b/src/BuildUtil/CoreUtil/Win32.cs @@ -327,7 +327,3 @@ namespace CoreUtil }
}
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/CoreUtil/Zip.cs b/src/BuildUtil/CoreUtil/Zip.cs index 71e1e61a..4c605845 100644 --- a/src/BuildUtil/CoreUtil/Zip.cs +++ b/src/BuildUtil/CoreUtil/Zip.cs @@ -506,7 +506,3 @@ namespace CoreUtil }
}
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/PEUtil.cs b/src/BuildUtil/PEUtil.cs index 3d0f2026..5dfa9c6d 100644 --- a/src/BuildUtil/PEUtil.cs +++ b/src/BuildUtil/PEUtil.cs @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -255,7 +255,3 @@ namespace BuildUtil }
}
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/Properties/Resources.Designer.cs b/src/BuildUtil/Properties/Resources.Designer.cs index 06e2fc3a..13dc1f9b 100644 --- a/src/BuildUtil/Properties/Resources.Designer.cs +++ b/src/BuildUtil/Properties/Resources.Designer.cs @@ -1073,7 +1073,3 @@ namespace BuildUtil.Properties { }
}
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/Properties/Settings.Designer.cs b/src/BuildUtil/Properties/Settings.Designer.cs index eb98cd2d..e17f4720 100644 --- a/src/BuildUtil/Properties/Settings.Designer.cs +++ b/src/BuildUtil/Properties/Settings.Designer.cs @@ -139,7 +139,3 @@ namespace BuildUtil.Properties { }
}
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/Test.cs b/src/BuildUtil/Test.cs index a5a9b7c3..728535d2 100644 --- a/src/BuildUtil/Test.cs +++ b/src/BuildUtil/Test.cs @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -143,7 +143,3 @@ namespace BuildUtil }
}
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/UnixBuildSoftwares.cs b/src/BuildUtil/UnixBuildSoftwares.cs index 372c78fc..1103d64e 100644 --- a/src/BuildUtil/UnixBuildSoftwares.cs +++ b/src/BuildUtil/UnixBuildSoftwares.cs @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1082,7 +1082,3 @@ namespace BuildUtil }
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/VpnBuilder.cs b/src/BuildUtil/VpnBuilder.cs index b9817bfc..2fcc6a1c 100644 --- a/src/BuildUtil/VpnBuilder.cs +++ b/src/BuildUtil/VpnBuilder.cs @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -689,7 +689,3 @@ namespace BuildUtil }
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/VpnBuilderConfig.cs b/src/BuildUtil/VpnBuilderConfig.cs index 5a306389..1bd29f7d 100644 --- a/src/BuildUtil/VpnBuilderConfig.cs +++ b/src/BuildUtil/VpnBuilderConfig.cs @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -564,7 +564,3 @@ namespace BuildUtil }
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/VpnBuilderConfigTypes.cs b/src/BuildUtil/VpnBuilderConfigTypes.cs index ecaa90ec..c992369b 100644 --- a/src/BuildUtil/VpnBuilderConfigTypes.cs +++ b/src/BuildUtil/VpnBuilderConfigTypes.cs @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -327,7 +327,3 @@ namespace BuildUtil }
}
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/Web References/HvSignService/Reference.cs b/src/BuildUtil/Web References/HvSignService/Reference.cs index 2d5056c2..33921979 100644 --- a/src/BuildUtil/Web References/HvSignService/Reference.cs +++ b/src/BuildUtil/Web References/HvSignService/Reference.cs @@ -374,7 +374,4 @@ namespace BuildUtil.HvSignService { }
}
-#pragma warning restore 1591
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
+#pragma warning restore 1591
\ No newline at end of file diff --git a/src/BuildUtil/Web References/SignService/Reference.cs b/src/BuildUtil/Web References/SignService/Reference.cs index 24e39186..fe838f44 100644 --- a/src/BuildUtil/Web References/SignService/Reference.cs +++ b/src/BuildUtil/Web References/SignService/Reference.cs @@ -305,7 +305,4 @@ namespace BuildUtil.SignService { }
}
-#pragma warning restore 1591
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
+#pragma warning restore 1591
\ No newline at end of file diff --git a/src/BuildUtil/Win32BuildSoftware.cs b/src/BuildUtil/Win32BuildSoftware.cs index 7e8446b6..5da84aae 100644 --- a/src/BuildUtil/Win32BuildSoftware.cs +++ b/src/BuildUtil/Win32BuildSoftware.cs @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -184,7 +184,3 @@ namespace BuildUtil }
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/BuildUtil/Win32BuildUtil.cs b/src/BuildUtil/Win32BuildUtil.cs index 508d1b14..b9dd9a8d 100644 --- a/src/BuildUtil/Win32BuildUtil.cs +++ b/src/BuildUtil/Win32BuildUtil.cs @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1448,7 +1448,3 @@ namespace BuildUtil }
}
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Account.c b/src/Cedar/Account.c index 5c59baf9..0ca0c37c 100644 --- a/src/Cedar/Account.c +++ b/src/Cedar/Account.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1448,7 +1448,3 @@ int CompareUserName(void *p1, void *p2) return StrCmpi(u1->Name, u2->Name);
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Account.h b/src/Cedar/Account.h index 84fa5f12..ffc4990b 100644 --- a/src/Cedar/Account.h +++ b/src/Cedar/Account.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -317,7 +317,3 @@ char *NormalizePolicyName(char *name); #endif // ACCOUNT_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Admin.c b/src/Cedar/Admin.c index f0908f47..ca2c4901 100644 --- a/src/Cedar/Admin.c +++ b/src/Cedar/Admin.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -6739,7 +6739,7 @@ UINT StAddCa(ADMIN *a, RPC_HUB_ADD_CA *t) if (t->Cert == NULL)
{
- ERR_INVALID_PARAMETER;
+ return ERR_INVALID_PARAMETER;
}
if (t->Cert->is_compatible_bit == false)
@@ -13907,7 +13907,3 @@ bool SiIsEmptyPassword(void *hash_password) return false;
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Admin.h b/src/Cedar/Admin.h index 56bb7075..dc7a4cc1 100644 --- a/src/Cedar/Admin.h +++ b/src/Cedar/Admin.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1533,7 +1533,3 @@ void OutRpcInternetSetting(PACK *p, INTERNET_SETTING *t); #endif // ADMIN_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/AzureClient.c b/src/Cedar/AzureClient.c index 0daa4f14..a280839c 100644 --- a/src/Cedar/AzureClient.c +++ b/src/Cedar/AzureClient.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -683,7 +683,3 @@ AZURE_CLIENT *NewAzureClient(CEDAR *cedar, SERVER *server) return ac;
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/AzureClient.h b/src/Cedar/AzureClient.h index e68ddff8..7f95ce1d 100644 --- a/src/Cedar/AzureClient.h +++ b/src/Cedar/AzureClient.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -173,7 +173,3 @@ void AcWaitForRequest(AZURE_CLIENT *ac, SOCK *s, AZURE_PARAM *param); #endif // AZURE_CLIENT_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/AzureServer.c b/src/Cedar/AzureServer.c index 2f2d7e51..5beaae18 100644 --- a/src/Cedar/AzureServer.c +++ b/src/Cedar/AzureServer.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -114,7 +114,3 @@ #include "CedarPch.h"
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/AzureServer.h b/src/Cedar/AzureServer.h index b0afe5f0..b3904230 100644 --- a/src/Cedar/AzureServer.h +++ b/src/Cedar/AzureServer.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -118,7 +118,3 @@ #endif // AZURE_SERVER_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Bridge.c b/src/Cedar/Bridge.c index cc19bdc7..38397285 100644 --- a/src/Cedar/Bridge.c +++ b/src/Cedar/Bridge.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -566,7 +566,3 @@ bool IsRawIpBridgeSupported() #endif // UNIX_LINUX
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Bridge.h b/src/Cedar/Bridge.h index a08b8b74..569508ad 100644 --- a/src/Cedar/Bridge.h +++ b/src/Cedar/Bridge.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -180,7 +180,3 @@ bool IsRawIpBridgeSupported(); -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/BridgeUnix.c b/src/Cedar/BridgeUnix.c index 74d36d9a..1173af89 100644 --- a/src/Cedar/BridgeUnix.c +++ b/src/Cedar/BridgeUnix.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -2808,7 +2808,3 @@ void EthPutPacketLinuxIpRaw(ETH *e, void *data, UINT size) #endif // BRIDGE_C
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/BridgeUnix.h b/src/Cedar/BridgeUnix.h index f82fe001..182eec9f 100644 --- a/src/Cedar/BridgeUnix.h +++ b/src/Cedar/BridgeUnix.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -238,7 +238,3 @@ int UnixEthOpenRawSocket(); #endif // BRIDGEUNIX_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/BridgeWin32.c b/src/Cedar/BridgeWin32.c index 74dd2abb..cfc7797a 100644 --- a/src/Cedar/BridgeWin32.c +++ b/src/Cedar/BridgeWin32.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -2243,7 +2243,3 @@ void GetEthNetworkConnectionName(wchar_t *dst, UINT size, char *device_name) #endif // BRIDGE_C
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/BridgeWin32.h b/src/Cedar/BridgeWin32.h index 6c776a20..51575449 100644 --- a/src/Cedar/BridgeWin32.h +++ b/src/Cedar/BridgeWin32.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -266,7 +266,3 @@ bool Win32GetEnableSeLow(); #endif // BRIDGEWIN32_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/CM.c b/src/Cedar/CM.c index e238619c..3a37b280 100644 --- a/src/Cedar/CM.c +++ b/src/Cedar/CM.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -12526,7 +12526,3 @@ void *CmUpdateJumpList(UINT start_id) #endif // WIN32
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/CM.h b/src/Cedar/CM.h index c48b58e8..a5eecf66 100644 --- a/src/Cedar/CM.h +++ b/src/Cedar/CM.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -156,7 +156,3 @@ UINT CmGetSecureBitmapId(char *dest_hostname); #endif // CM_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/CMInner.h b/src/Cedar/CMInner.h index 8fecdceb..71db5369 100644 --- a/src/Cedar/CMInner.h +++ b/src/Cedar/CMInner.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -639,7 +639,3 @@ bool CmGetProxyServerNameAndPortFromIeProxyRegStr(char *name, UINT name_size, UI void *CmUpdateJumpList(UINT start_id);
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Cedar.c b/src/Cedar/Cedar.c index 9763e613..6108efaf 100644 --- a/src/Cedar/Cedar.c +++ b/src/Cedar/Cedar.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1914,7 +1914,3 @@ void FreeCedar() FreeProtocol();
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Cedar.h b/src/Cedar/Cedar.h index a4f8c196..f56ca6cb 100644 --- a/src/Cedar/Cedar.h +++ b/src/Cedar/Cedar.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -135,10 +135,10 @@ // Version number
-#define CEDAR_VER 422
+#define CEDAR_VER 423
// Build Number
-#define CEDAR_BUILD 9634
+#define CEDAR_BUILD 9647
// Beta number
//#define BETA_NUMBER 3
@@ -153,16 +153,16 @@ // Specify the location to build
#ifndef BUILD_PLACE
-#define BUILD_PLACE "pc30"
+#define BUILD_PLACE "pc33"
#endif // BUILD_PLACE
// Specifies the build date
-#define BUILD_DATE_Y 2016
-#define BUILD_DATE_M 11
-#define BUILD_DATE_D 27
-#define BUILD_DATE_HO 14
-#define BUILD_DATE_MI 33
-#define BUILD_DATE_SE 59
+#define BUILD_DATE_Y 2017
+#define BUILD_DATE_M 10
+#define BUILD_DATE_D 18
+#define BUILD_DATE_HO 16
+#define BUILD_DATE_MI 30
+#define BUILD_DATE_SE 44
// Tolerable time difference
#define ALLOW_TIMESTAMP_DIFF (UINT64)(3 * 24 * 60 * 60 * 1000)
@@ -1265,7 +1265,3 @@ bool CedarIsThereAnyEapEnabledRadiusConfig(CEDAR *c); #endif // CEDAR_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/CedarPch.c b/src/Cedar/CedarPch.c index 7c6085c7..726bf019 100644 --- a/src/Cedar/CedarPch.c +++ b/src/Cedar/CedarPch.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -113,7 +113,3 @@ #include "CedarPch.h"
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/CedarPch.h b/src/Cedar/CedarPch.h index a26e2a96..8db26451 100644 --- a/src/Cedar/CedarPch.h +++ b/src/Cedar/CedarPch.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -124,7 +124,3 @@ #include <Mayaqua/Mayaqua.h>
#include <Cedar/Cedar.h>
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/CedarType.h b/src/Cedar/CedarType.h index e27c564b..46db1348 100644 --- a/src/Cedar/CedarType.h +++ b/src/Cedar/CedarType.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -538,6 +538,8 @@ typedef struct CTC CTC; typedef struct CTR CTR;
typedef struct TTC TTC;
typedef struct TTS TTS;
+typedef struct TTS_WORKER TTS_WORKER;
+typedef struct TTC_WORKER TTC_WORKER;
typedef struct TT_RESULT TT_RESULT;
typedef struct TTS_SOCK TTS_SOCK;
typedef struct TTC_SOCK TTC_SOCK;
@@ -763,7 +765,3 @@ typedef struct SU_ADAPTER_LIST SU_ADAPTER_LIST; #endif // CEDARTYPE_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Client.c b/src/Cedar/Client.c index c4aa26d7..861e6453 100644 --- a/src/Cedar/Client.c +++ b/src/Cedar/Client.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -11112,7 +11112,3 @@ void CiClientStatusPrinter(SESSION *s, wchar_t *status) }
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Client.h b/src/Cedar/Client.h index dc450781..d30584f9 100644 --- a/src/Cedar/Client.h +++ b/src/Cedar/Client.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -878,7 +878,3 @@ void CiInitDriverVerStruct(MS_DRIVER_VER *ver); #endif // CLIENT_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Command.c b/src/Cedar/Command.c index 365257cd..81e12af0 100644 --- a/src/Cedar/Command.c +++ b/src/Cedar/Command.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1166,6 +1166,7 @@ void TtGenerateRandomData(UCHAR **buf, UINT *size) void TtsWorkerThread(THREAD *thread, void *param)
{
TTS *tts;
+ TTS_WORKER *w;
UINT buf_size;
UCHAR *send_buf_data, *recv_buf_data;
bool all_sockets_blocked = false;
@@ -1185,14 +1186,15 @@ void TtsWorkerThread(THREAD *thread, void *param) TtGenerateRandomData(&send_buf_data, &buf_size);
TtGenerateRandomData(&recv_buf_data, &buf_size);
- tts = (TTS *)param;
+ w = (TTS_WORKER *)param;
+ tts = (TTS *)w->Tts;
// Preparation of socket events
- tts->SockEvent = NewSockEvent();
- AddRef(tts->SockEvent->ref);
+ w->SockEvent = NewSockEvent();
+ AddRef(w->SockEvent->ref);
// Preparing the Server socket list
- tts->TtsSockList = NewList(NULL);
+ w->TtsSockList = NewList(NULL);
// Notify completion of preparation to parent thread
NoticeThreadInit(thread);
@@ -1206,12 +1208,12 @@ void TtsWorkerThread(THREAD *thread, void *param) // Wait for all sockets
if (dont_block_next_time == false)
{
- WaitSockEvent(tts->SockEvent, 50);
+ WaitSockEvent(w->SockEvent, 50);
}
dont_block_next_time = false;
// Process for sockets that are currently registered
- LockList(tts->TtsSockList);
+ LockList(w->TtsSockList);
{
UINT i;
@@ -1223,17 +1225,17 @@ void TtsWorkerThread(THREAD *thread, void *param) {
all_sockets_blocked = true;
- for (i = 0;i < LIST_NUM(tts->TtsSockList);i++)
+ for (i = 0;i < LIST_NUM(w->TtsSockList);i++)
{
UINT ret = SOCK_LATER;
UCHAR *send_data = NULL, *recv_data = NULL;
UINT send_size = 0, recv_size = 0;
- TTS_SOCK *ts = LIST_DATA(tts->TtsSockList, i);
+ TTS_SOCK *ts = LIST_DATA(w->TtsSockList, i);
bool blocked_for_this_socket = false;
if (ts->SockJoined == false)
{
- JoinSockToSockEvent(ts->Sock, tts->SockEvent);
+ JoinSockToSockEvent(ts->Sock, w->SockEvent);
ts->SockJoined = true;
}
@@ -1396,9 +1398,9 @@ void TtsWorkerThread(THREAD *thread, void *param) {
// Not to send more data to the socket of the
// transmission direction in the same session ID
- for (j = 0;j < LIST_NUM(tts->TtsSockList);j++)
+ for (j = 0;j < LIST_NUM(w->TtsSockList);j++)
{
- TTS_SOCK *ts2 = LIST_DATA(tts->TtsSockList, j);
+ TTS_SOCK *ts2 = LIST_DATA(w->TtsSockList, j);
if (ts2->SessionId == ts->SessionId &&
ts2 != ts)
@@ -1457,7 +1459,7 @@ void TtsWorkerThread(THREAD *thread, void *param) Disconnect(ts->Sock);
ReleaseSock(ts->Sock);
- Delete(tts->TtsSockList, ts);
+ Delete(w->TtsSockList, ts);
Free(ts);
}
@@ -1465,23 +1467,23 @@ void TtsWorkerThread(THREAD *thread, void *param) DeleteAll(o);
}
- if (tts->NewSocketArrived || tts->Halt)
+ if (w->NewSocketArrived || tts->Halt)
{
- tts->NewSocketArrived = false;
+ w->NewSocketArrived = false;
all_sockets_blocked = true;
dont_block_next_time = true;
}
}
}
- UnlockList(tts->TtsSockList);
+ UnlockList(w->TtsSockList);
}
- LockList(tts->TtsSockList);
+ LockList(w->TtsSockList);
{
// Release the sockets of all remaining
- for (i = 0;i < LIST_NUM(tts->TtsSockList);i++)
+ for (i = 0;i < LIST_NUM(w->TtsSockList);i++)
{
- TTS_SOCK *ts = LIST_DATA(tts->TtsSockList, i);
+ TTS_SOCK *ts = LIST_DATA(w->TtsSockList, i);
UniFormat(tmp, sizeof(tmp), _UU("TTS_DISCONNECT"), ts->Id, ts->Sock->RemoteHostname);
TtPrint(tts->Param, tts->Print, tmp);
@@ -1492,12 +1494,12 @@ void TtsWorkerThread(THREAD *thread, void *param) Free(ts);
}
}
- UnlockList(tts->TtsSockList);
+ UnlockList(w->TtsSockList);
// Cleanup
ReleaseList(o);
- ReleaseList(tts->TtsSockList);
- ReleaseSockEvent(tts->SockEvent);
+ ReleaseList(w->TtsSockList);
+ ReleaseSockEvent(w->SockEvent);
Free(send_buf_data);
Free(recv_buf_data);
}
@@ -1519,6 +1521,7 @@ void TtsIPv6AcceptThread(THREAD *thread, void *param) void TtsAcceptProc(TTS *tts, SOCK *listen_socket)
{
wchar_t tmp[MAX_SIZE];
+ UINT seed = 0;
// Validate arguments
if (tts == NULL || listen_socket == NULL)
{
@@ -1541,10 +1544,23 @@ void TtsAcceptProc(TTS *tts, SOCK *listen_socket) }
else
{
+ UINT num, i;
+ TTS_WORKER *w;
+
// Connected from the client
AcceptInitEx(s, true);
- tts->NewSocketArrived = true;
- LockList(tts->TtsSockList);
+
+ // Choose a worker thread
+ num = LIST_NUM(tts->WorkerList);
+
+ i = seed % num;
+
+ seed++;
+
+ w = LIST_DATA(tts->WorkerList, i);
+
+ w->NewSocketArrived = true;
+ LockList(w->TtsSockList);
{
TTS_SOCK *ts = ZeroMalloc(sizeof(TTS_SOCK));
@@ -1558,12 +1574,12 @@ void TtsAcceptProc(TTS *tts, SOCK *listen_socket) s->RemoteHostname, s->RemotePort);
TtPrint(tts->Param, tts->Print, tmp);
- Insert(tts->TtsSockList, ts);
- tts->NewSocketArrived = true;
+ Insert(w->TtsSockList, ts);
+ w->NewSocketArrived = true;
}
- UnlockList(tts->TtsSockList);
+ UnlockList(w->TtsSockList);
- SetSockEvent(tts->SockEvent);
+ SetSockEvent(w->SockEvent);
}
}
}
@@ -1598,6 +1614,8 @@ void TtsListenThread(THREAD *thread, void *param) }
else
{
+ UINT i, num_worker_threads;
+
UniFormat(tmp, sizeof(tmp), _UU("TTS_LISTEN_STARTED"), tts->Port);
TtPrint(tts->Param, tts->Print, tmp);
@@ -1621,9 +1639,19 @@ void TtsListenThread(THREAD *thread, void *param) AddRef(tts->ListenSocketV6->ref);
}
- // Start the worker thread
- tts->WorkThread = NewThread(TtsWorkerThread, tts);
- WaitThreadInit(tts->WorkThread);
+ num_worker_threads = GetNumberOfCpu();
+
+ // Start the worker threads
+ for (i = 0;i < num_worker_threads;i++)
+ {
+ TTS_WORKER *w = ZeroMalloc(sizeof(TTS_WORKER));
+
+ w->Tts = tts;
+ w->WorkThread = NewThread(TtsWorkerThread, w);
+ WaitThreadInit(w->WorkThread);
+
+ Add(tts->WorkerList, w);
+ }
// Notify completion of preparation to parent thread
NoticeThreadInit(thread);
@@ -1647,12 +1675,20 @@ void TtsListenThread(THREAD *thread, void *param) ReleaseSock(tts->ListenSocket);
ReleaseSock(tts->ListenSocketV6);
- SetSockEvent(tts->SockEvent);
- // Wait for stopping the worker thread
- WaitThread(tts->WorkThread, INFINITE);
- ReleaseThread(tts->WorkThread);
- ReleaseSockEvent(tts->SockEvent);
+ for (i = 0;i < LIST_NUM(tts->WorkerList);i++)
+ {
+ TTS_WORKER *w = LIST_DATA(tts->WorkerList, i);
+
+ SetSockEvent(w->SockEvent);
+
+ // Wait for stopping the worker thread
+ WaitThread(w->WorkThread, INFINITE);
+ ReleaseThread(w->WorkThread);
+ ReleaseSockEvent(w->SockEvent);
+
+ Free(w);
+ }
}
}
@@ -1737,7 +1773,6 @@ void StopTtc(TTC *ttc) TtPrint(ttc->Param, ttc->Print, _UU("TTC_STOPPING"));
ttc->Halt = true;
- SetSockEvent(ttc->SockEvent);
}
// Generate a result
@@ -1800,6 +1835,301 @@ void TtcGenerateResult(TTC *ttc) res->BpsTotal = res->BpsUpload + res->BpsDownload;
}
+// Client worker thread
+void TtcWorkerThread(THREAD *thread, void *param)
+{
+ TTC_WORKER *w;
+ TTC *ttc;
+ bool dont_block_next_time = false;
+ bool halting = false;
+ UINT64 halt_timeout = 0;
+ bool all_sockets_blocked;
+ wchar_t tmp[MAX_SIZE];
+ UCHAR *send_buf_data, *recv_buf_data;
+ UINT buf_size;
+ UINT64 tmp64;
+
+ if (thread == NULL || param == NULL)
+ {
+ return;
+ }
+
+ w = (TTC_WORKER *)param;
+ ttc = w->Ttc;
+
+ // Allocate the data area
+ TtGenerateRandomData(&send_buf_data, &buf_size);
+ TtGenerateRandomData(&recv_buf_data, &buf_size);
+
+ NoticeThreadInit(thread);
+
+ // Wait for start
+ Wait(w->StartEvent, INFINITE);
+
+ // Main loop
+ while (true)
+ {
+ UINT i;
+
+ if (dont_block_next_time == false)
+ {
+ WaitSockEvent(w->SockEvent, 50);
+ }
+
+ dont_block_next_time = false;
+
+ if (ttc->AbnormalTerminated)
+ {
+ // Abnormal termination occured
+ break;
+ }
+
+ if (ttc->Halt || ttc->end_tick <= Tick64() || (ttc->Cancel != NULL && (*ttc->Cancel)))
+ {
+ // End measurement
+ if (halting == false)
+ {
+ if (ttc->Halt || (ttc->Cancel != NULL && (*ttc->Cancel)))
+ {
+ if ((ttc->flag1++) == 0)
+ {
+ // User cancel
+ TtPrint(ttc->Param, ttc->Print, _UU("TTC_COMM_USER_CANCEL"));
+ }
+ }
+ else
+ {
+ // Time elapsed
+ if ((ttc->flag2++) == 0)
+ {
+ UniFormat(tmp, sizeof(tmp), _UU("TTC_COMM_END"),
+ (double)ttc->Span / 1000.0);
+ TtPrint(ttc->Param, ttc->Print, tmp);
+ }
+ }
+
+ if (ttc->RealSpan == 0)
+ {
+ ttc->RealSpan = Tick64() - ttc->start_tick;
+ }
+
+ halting = true;
+
+ // Wait for reporting data from the server
+ halt_timeout = Tick64() + 60000ULL;
+ }
+ }
+
+ if (halt_timeout != 0)
+ {
+ bool ok = true;
+
+ // Wait that all TCP connections to finish processing
+ for (i = 0;i < LIST_NUM(w->SockList);i++)
+ {
+ TTC_SOCK *ts = LIST_DATA(w->SockList, i);
+
+ if (ts->Download == false)
+ {
+ if (ts->ServerUploadReportReceived == false)
+ {
+ ok = false;
+ }
+ }
+ }
+
+ if (ok)
+ {
+ // Measurement completed
+ w->Ok = true;
+ break;
+ }
+ else
+ {
+ if (halt_timeout <= Tick64())
+ {
+ // An error occured
+ ttc->AbnormalTerminated = true;
+ ttc->ErrorCode = ERR_PROTOCOL_ERROR;
+ break;
+ }
+ }
+ }
+
+ all_sockets_blocked = false;
+
+ // Continue to send and receive data
+ // until all sockets become block state
+ while (all_sockets_blocked == false)
+ {
+ all_sockets_blocked = true;
+
+ for (i = 0;i < LIST_NUM(w->SockList);i++)
+ {
+ UINT ret = SOCK_LATER;
+ TTC_SOCK *ts = LIST_DATA(w->SockList, i);
+ bool blocked_for_this_socket = false;
+ UCHAR c = 0;
+ UCHAR c_and_session_id[1 + sizeof(UINT64) + sizeof(UINT64)];
+
+ if (halt_timeout != 0)
+ {
+ if (ts->State != 3 && ts->State != 4)
+ {
+ if (ts->Download == false)
+ {
+ if (ts->State != 0)
+ {
+ ts->State = 3;
+ }
+ else
+ {
+ ts->ServerUploadReportReceived = true;
+ ts->State = 4;
+ }
+ }
+ else
+ {
+ ts->State = 4;
+ }
+ }
+ }
+
+ switch (ts->State)
+ {
+ case 0:
+ // Initial state: Specify the direction of
+ // the data flow between client-server
+ if (ts->Download)
+ {
+ c = 1;
+ }
+ else
+ {
+ c = 0;
+ }
+
+ c_and_session_id[0] = c;
+ WRITE_UINT64(c_and_session_id + 1, ttc->session_id);
+ WRITE_UINT64(c_and_session_id + sizeof(UINT64) + 1, ttc->Span);
+
+ ret = Send(ts->Sock, c_and_session_id, 1 + sizeof(UINT64) + sizeof(UINT64), false);
+
+ if (ret != 0 && ret != SOCK_LATER)
+ {
+ if (ts->Download)
+ {
+ ts->State = 1;
+ }
+ else
+ {
+ ts->State = 2;
+ }
+ }
+ break;
+
+ case 1:
+ // Server -> Client (download)
+ ret = Recv(ts->Sock, recv_buf_data, buf_size, false);
+ break;
+
+ case 2:
+ // Client -> Server (upload)
+ ret = Send(ts->Sock, send_buf_data, buf_size, false);
+ break;
+
+ case 3:
+ // Transmission completion client -> server (upload)
+ // Request the data size
+ if (ts->NextSendRequestReportTick == 0 ||
+ (Tick64() >= ts->NextSendRequestReportTick))
+ {
+ UCHAR suprise[MAX_SIZE];
+ UINT i;
+
+ ts->NextSendRequestReportTick = Tick64() + 200ULL;
+
+ for (i = 0;i < sizeof(suprise);i++)
+ {
+ suprise[i] = '!';
+ }
+
+ ret = Send(ts->Sock, suprise, sizeof(suprise), false);
+ }
+
+ ret = Recv(ts->Sock, &tmp64, sizeof(tmp64), false);
+ if (ret != 0 && ret != SOCK_LATER && ret == sizeof(tmp64))
+ {
+ ts->NumBytes = Endian64(tmp64);
+
+ ts->ServerUploadReportReceived = true;
+
+ ts->State = 4;
+ }
+ break;
+
+ case 4:
+ // Do Nothing
+ if (Recv(ts->Sock, recv_buf_data, buf_size, false) == SOCK_LATER)
+ {
+ ret = SOCK_LATER;
+ }
+ break;
+ }
+
+ if (ret == 0)
+ {
+ // The socket is disconnected
+ ttc->AbnormalTerminated = true;
+ ttc->ErrorCode = ERR_PROTOCOL_ERROR;
+ blocked_for_this_socket = true;
+ dont_block_next_time = false;
+
+ if (ts->HideErrMsg == false)
+ {
+ UniFormat(tmp, sizeof(tmp), _UU("TTC_COMM_DISCONNECTED"), ts->Id);
+ TtPrint(ttc->Param, ttc->Print, tmp);
+ ts->HideErrMsg = true;
+ }
+ }
+ else if (ret == SOCK_LATER)
+ {
+ // Delay has occurred
+ blocked_for_this_socket = true;
+ dont_block_next_time = false;
+ }
+ else
+ {
+ if (ts->Download)
+ {
+ ts->NumBytes += (UINT64)ret;
+ }
+ }
+
+ if (blocked_for_this_socket == false)
+ {
+ all_sockets_blocked = false;
+ }
+ }
+
+ if (ttc->Halt || (ttc->Cancel != NULL && (*ttc->Cancel)))
+ {
+ all_sockets_blocked = true;
+ dont_block_next_time = true;
+ }
+
+ if (ttc->end_tick <= Tick64())
+ {
+ all_sockets_blocked = true;
+ dont_block_next_time = true;
+ }
+ }
+ }
+
+ Free(send_buf_data);
+ Free(recv_buf_data);
+}
+
// Client thread
void TtcThread(THREAD *thread, void *param)
{
@@ -1807,8 +2137,6 @@ void TtcThread(THREAD *thread, void *param) UINT i;
wchar_t tmp[MAX_SIZE];
bool ok = false;
- UINT buf_size;
- UCHAR *send_buf_data, *recv_buf_data;
IP ip_ret;
// Validate arguments
if (thread == NULL || param == NULL)
@@ -1816,15 +2144,8 @@ void TtcThread(THREAD *thread, void *param) return;
}
- // Allocate the data area
- TtGenerateRandomData(&send_buf_data, &buf_size);
- TtGenerateRandomData(&recv_buf_data, &buf_size);
-
ttc = (TTC *)param;
- ttc->SockEvent = NewSockEvent();
- AddRef(ttc->SockEvent->ref);
-
// Ready
NoticeThreadInit(thread);
@@ -1904,8 +2225,6 @@ void TtcThread(THREAD *thread, void *param) ts->Sock = s;
SetTimeout(s, TIMEOUT_INFINITE);
-
- JoinSockToSockEvent(s, ttc->SockEvent);
}
Insert(ttc->ItcSockList, ts);
@@ -1921,278 +2240,109 @@ void TtcThread(THREAD *thread, void *param) if (ok)
{
- bool all_sockets_blocked;
- bool dont_block_next_time = false;
- bool halt_flag = false;
UINT64 start_tick, end_tick;
UINT64 halt_timeout = 0;
wchar_t tmp1[MAX_SIZE], tmp2[MAX_SIZE];
UINT check_clock_seed = 0;
bool halting = false;
- UINT64 tmp64;
UINT64 session_id = Rand64();
+ UINT i, num_cpu;
+ bool all_ok = false;
- // Record the current time
- start_tick = Tick64();
- end_tick = start_tick + ttc->Span;
-
- // Show start message
- GetDateTimeStrEx64(tmp1, sizeof(tmp1), SystemToLocal64(TickToTime(start_tick)), NULL);
- GetDateTimeStrEx64(tmp2, sizeof(tmp2), SystemToLocal64(TickToTime(end_tick)), NULL);
- UniFormat(tmp, sizeof(tmp), _UU("TTC_COMM_START"), tmp1, tmp2);
- TtPrint(ttc->Param, ttc->Print, tmp);
-
- // Main loop
- while (true)
- {
- UINT i;
-
- if (dont_block_next_time == false)
- {
- WaitSockEvent(ttc->SockEvent, 50);
- }
-
- dont_block_next_time = false;
-
- if (ttc->AbnormalTerminated)
- {
- // Abnormal termination occured
- break;
- }
-
- if (ttc->Halt || end_tick <= Tick64() || (ttc->Cancel != NULL && (*ttc->Cancel)))
- {
- // End measurement
- if (halting == false)
- {
- if (ttc->Halt || (ttc->Cancel != NULL && (*ttc->Cancel)))
- {
- // User cancel
- TtPrint(ttc->Param, ttc->Print, _UU("TTC_COMM_USER_CANCEL"));
- }
- else
- {
- // Time elapsed
- UniFormat(tmp, sizeof(tmp), _UU("TTC_COMM_END"),
- (double)ttc->Span / 1000.0);
- TtPrint(ttc->Param, ttc->Print, tmp);
- }
-
- ttc->RealSpan = Tick64() - start_tick;
-
- halting = true;
-
- // Wait for reporting data from the server
- halt_timeout = Tick64() + 60000ULL;
- }
- }
-
- if (halt_timeout != 0)
- {
- bool ok = true;
-
- // Wait that all TCP connections to finish processing
- for (i = 0;i < LIST_NUM(ttc->ItcSockList);i++)
- {
- TTC_SOCK *ts = LIST_DATA(ttc->ItcSockList, i);
+ ttc->session_id = session_id;
- if (ts->Download == false)
- {
- if (ts->ServerUploadReportReceived == false)
- {
- ok = false;
- }
- }
- }
+ num_cpu = GetNumberOfCpu();
- if (ok)
- {
- // Measurement completed
- // Show the result
- TtcGenerateResult(ttc);
- break;
- }
- else
- {
- if (halt_timeout <= Tick64())
- {
- // An error occured
- ttc->AbnormalTerminated = true;
- ttc->ErrorCode = ERR_PROTOCOL_ERROR;
- break;
- }
- }
- }
+ ttc->WorkerThreadList = NewList(NULL);
- all_sockets_blocked = false;
+ for (i = 0;i < num_cpu;i++)
+ {
+ TTC_WORKER *w = ZeroMalloc(sizeof(TTC_WORKER));
- // Continue to send and receive data
- // until all sockets become block state
- while (all_sockets_blocked == false)
- {
- all_sockets_blocked = true;
+ w->Ttc = ttc;
+ w->SockList = NewList(NULL);
+ w->StartEvent = NewEvent();
+ w->SockEvent = NewSockEvent();
- for (i = 0;i < LIST_NUM(ttc->ItcSockList);i++)
- {
- UINT ret = SOCK_LATER;
- TTC_SOCK *ts = LIST_DATA(ttc->ItcSockList, i);
- bool blocked_for_this_socket = false;
- UCHAR c = 0;
- UCHAR c_and_session_id[1 + sizeof(UINT64) + sizeof(UINT64)];
-
- if (halt_timeout != 0)
- {
- if (ts->State != 3 && ts->State != 4)
- {
- if (ts->Download == false)
- {
- if (ts->State != 0)
- {
- ts->State = 3;
- }
- else
- {
- ts->ServerUploadReportReceived = true;
- ts->State = 4;
- }
- }
- else
- {
- ts->State = 4;
- }
- }
- }
+ w->WorkerThread = NewThread(TtcWorkerThread, w);
- switch (ts->State)
- {
- case 0:
- // Initial state: Specify the direction of
- // the data flow between client-server
- if (ts->Download)
- {
- c = 1;
- }
- else
- {
- c = 0;
- }
+ WaitThreadInit(w->WorkerThread);
- c_and_session_id[0] = c;
- WRITE_UINT64(c_and_session_id + 1, session_id);
- WRITE_UINT64(c_and_session_id + sizeof(UINT64) + 1, ttc->Span);
+ Add(ttc->WorkerThreadList, w);
+ }
- ret = Send(ts->Sock, c_and_session_id, 1 + sizeof(UINT64) + sizeof(UINT64), false);
+ // Assign each of sockets to each of worker threads
+ for (i = 0;i < LIST_NUM(ttc->ItcSockList);i++)
+ {
+ TTC_SOCK *ts = LIST_DATA(ttc->ItcSockList, i);
+ UINT num = LIST_NUM(ttc->WorkerThreadList);
+ UINT j = i % num;
+ TTC_WORKER *w = LIST_DATA(ttc->WorkerThreadList, j);
- if (ret != 0 && ret != SOCK_LATER)
- {
- if (ts->Download)
- {
- ts->State = 1;
- }
- else
- {
- ts->State = 2;
- }
- }
- break;
+ Add(w->SockList, ts);
- case 1:
- // Server -> Client (download)
- ret = Recv(ts->Sock, recv_buf_data, buf_size, false);
- break;
+ JoinSockToSockEvent(ts->Sock, w->SockEvent);
+ }
- case 2:
- // Client -> Server (upload)
- ret = Send(ts->Sock, send_buf_data, buf_size, false);
- break;
+ // Record the current time
+ start_tick = Tick64();
+ end_tick = start_tick + ttc->Span;
- case 3:
- // Transmission completion client -> server (upload)
- // Request the data size
- if (ts->NextSendRequestReportTick == 0 ||
- (Tick64() >= ts->NextSendRequestReportTick))
- {
- UCHAR suprise[MAX_SIZE];
- UINT i;
+ ttc->start_tick = start_tick;
+ ttc->end_tick = end_tick;
- ts->NextSendRequestReportTick = Tick64() + 200ULL;
+ // Set the start event for all worker threads
+ for (i = 0;i < LIST_NUM(ttc->WorkerThreadList);i++)
+ {
+ TTC_WORKER *w = LIST_DATA(ttc->WorkerThreadList, i);
- for (i = 0;i < sizeof(suprise);i++)
- {
- suprise[i] = '!';
- }
+ Set(w->StartEvent);
+ }
- ret = Send(ts->Sock, suprise, sizeof(suprise), false);
- }
+ // Show start message
+ GetDateTimeStrEx64(tmp1, sizeof(tmp1), SystemToLocal64(TickToTime(start_tick)), NULL);
+ GetDateTimeStrEx64(tmp2, sizeof(tmp2), SystemToLocal64(TickToTime(end_tick)), NULL);
+ UniFormat(tmp, sizeof(tmp), _UU("TTC_COMM_START"), tmp1, tmp2);
+ TtPrint(ttc->Param, ttc->Print, tmp);
- ret = Recv(ts->Sock, &tmp64, sizeof(tmp64), false);
- if (ret != 0 && ret != SOCK_LATER && ret == sizeof(tmp64))
- {
- ts->NumBytes = Endian64(tmp64);
+ // Wait for all worker threads finish
+ all_ok = true;
+ for (i = 0;i < LIST_NUM(ttc->WorkerThreadList);i++)
+ {
+ TTC_WORKER *w = LIST_DATA(ttc->WorkerThreadList, i);
- ts->ServerUploadReportReceived = true;
+ WaitThread(w->WorkerThread, INFINITE);
- ts->State = 4;
- }
- break;
+ if (w->Ok == false)
+ {
+ all_ok = false;
+ }
+ }
- case 4:
- // Do Nothing
- if (Recv(ts->Sock, recv_buf_data, buf_size, false) == SOCK_LATER)
- {
- ret = SOCK_LATER;
- }
- break;
- }
+ if (all_ok)
+ {
+ // Measurement completed
+ // Show the result
+ TtcGenerateResult(ttc);
+ }
- if (ret == 0)
- {
- // The socket is disconnected
- ttc->AbnormalTerminated = true;
- ttc->ErrorCode = ERR_PROTOCOL_ERROR;
- blocked_for_this_socket = true;
- dont_block_next_time = false;
+ // Release worker threads
+ for (i = 0;i < LIST_NUM(ttc->WorkerThreadList);i++)
+ {
+ TTC_WORKER *w = LIST_DATA(ttc->WorkerThreadList, i);
- if (ts->HideErrMsg == false)
- {
- UniFormat(tmp, sizeof(tmp), _UU("TTC_COMM_DISCONNECTED"), ts->Id);
- TtPrint(ttc->Param, ttc->Print, tmp);
- ts->HideErrMsg = true;
- }
- }
- else if (ret == SOCK_LATER)
- {
- // Delay has occurred
- blocked_for_this_socket = true;
- dont_block_next_time = false;
- }
- else
- {
- if (ts->Download)
- {
- ts->NumBytes += (UINT64)ret;
- }
- }
+ ReleaseThread(w->WorkerThread);
- if (blocked_for_this_socket == false)
- {
- all_sockets_blocked = false;
- }
- }
+ ReleaseEvent(w->StartEvent);
+ ReleaseList(w->SockList);
- if (ttc->Halt || (ttc->Cancel != NULL && (*ttc->Cancel)))
- {
- all_sockets_blocked = true;
- dont_block_next_time = true;
- }
+ ReleaseSockEvent(w->SockEvent);
- if (end_tick <= Tick64())
- {
- all_sockets_blocked = true;
- dont_block_next_time = true;
- }
- }
+ Free(w);
}
+
+ ReleaseList(ttc->WorkerThreadList);
+ ttc->WorkerThreadList = NULL;
}
else
{
@@ -2211,10 +2361,7 @@ void TtcThread(THREAD *thread, void *param) Free(ts);
}
- ReleaseSockEvent(ttc->SockEvent);
ReleaseList(ttc->ItcSockList);
- Free(send_buf_data);
- Free(recv_buf_data);
}
// Start the communication throughput measurement client
@@ -2280,7 +2427,6 @@ UINT FreeTtc(TTC *ttc, TT_RESULT *result) }
}
- ReleaseSockEvent(ttc->SockEvent);
ReleaseEvent(ttc->InitedEvent);
Free(ttc);
@@ -2301,6 +2447,8 @@ TTS *NewTts(UINT port, void *param, TT_PRINT_PROC *print_proc) TtPrint(param, print_proc, _UU("TTS_INIT"));
+ tts->WorkerList = NewList(NULL);
+
// Creating a thread
t = NewThread(TtsListenThread, tts);
WaitThreadInit(t);
@@ -2337,6 +2485,8 @@ UINT FreeTts(TTS *tts) ret = tts->ErrorCode;
+ ReleaseList(tts->WorkerList);
+
Free(tts);
return ret;
@@ -2356,16 +2506,20 @@ void PtTrafficPrintProc(void *param, wchar_t *str) if (c->ConsoleType == CONSOLE_LOCAL)
{
- wchar_t tmp[MAX_SIZE];
-
- // Display only if the local console
- // (Can not be displayed because threads aren't synchronized otherwise?)
- UniStrCpy(tmp, sizeof(tmp), str);
- if (UniEndWith(str, L"\n") == false)
+ Lock(c->OutputLock);
{
- UniStrCat(tmp, sizeof(tmp), L"\n");
+ wchar_t tmp[MAX_SIZE];
+
+ // Display only if the local console
+ // (Can not be displayed because threads aren't synchronized otherwise?)
+ UniStrCpy(tmp, sizeof(tmp), str);
+ if (UniEndWith(str, L"\n") == false)
+ {
+ UniStrCat(tmp, sizeof(tmp), L"\n");
+ }
+ UniPrint(L"%s", tmp);
}
- UniPrint(L"%s", tmp);
+ Unlock(c->OutputLock);
}
}
@@ -23850,7 +24004,3 @@ LABEL_CLEANUP: #endif // OS_WIN32
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Command.h b/src/Cedar/Command.h index d573d940..882c47c9 100644 --- a/src/Cedar/Command.h +++ b/src/Cedar/Command.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -181,13 +181,30 @@ struct TTC THREAD *Thread; // Thread
volatile bool Halt; // Halting flag
bool *Cancel; // Halting flag 2
- SOCK_EVENT *SockEvent; // Socket event
LIST *ItcSockList; // Client socket list
TT_RESULT Result; // Result
UINT ErrorCode; // Error code
bool AbnormalTerminated; // Abnormal termination
EVENT *StartEvent; // Start event
EVENT *InitedEvent; // Initialize completion notification event
+ LIST *WorkerThreadList; // List of worker threads
+
+ UINT flag1, flag2;
+
+ UINT64 session_id;
+ UINT64 end_tick;
+ UINT64 start_tick;
+};
+
+// Traffic test worker thread
+struct TTC_WORKER
+{
+ THREAD *WorkerThread;
+ TTC *Ttc;
+ LIST *SockList; // Client socket list
+ SOCK_EVENT *SockEvent; // Socket event
+ EVENT *StartEvent; // Start event
+ bool Ok; // The result
};
// Server side socket
@@ -216,15 +233,22 @@ struct TTS volatile bool Halt; // Halting flag
UINT Port; // Port number
THREAD *Thread; // Thread
- THREAD *WorkThread; // Worker thread
THREAD *IPv6AcceptThread; // IPv6 Accept thread
SOCK *ListenSocket; // Socket to wait
SOCK *ListenSocketV6; // Socket to wait (IPv6)
UINT ErrorCode; // Error code
+ UINT IdSeed; // ID value
+ LIST *WorkerList; // Worker threads list
+};
+
+// Traffic test worker thread
+struct TTS_WORKER
+{
+ TTS *Tts; // TTS
+ THREAD *WorkThread; // Worker thread
SOCK_EVENT *SockEvent; // Socket event
LIST *TtsSockList; // Server socket list
bool NewSocketArrived; // New socket has arrived
- UINT IdSeed; // ID value
};
// VPN Tools context
@@ -676,7 +700,3 @@ UINT PsVpnAzureGetStatus(CONSOLE *c, char *cmd_name, wchar_t *str, void *param); #endif // COMMAND_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Connection.c b/src/Cedar/Connection.c index 80097e1b..26d96d5f 100644 --- a/src/Cedar/Connection.c +++ b/src/Cedar/Connection.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -3669,6 +3669,3 @@ CONNECTION *NewClientConnectionEx(SESSION *s, char *client_str, UINT client_ver, return c;
}
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Connection.h b/src/Cedar/Connection.h index 98a7c1f2..b0383df5 100644 --- a/src/Cedar/Connection.h +++ b/src/Cedar/Connection.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -372,7 +372,3 @@ UINT GetMachineRand(); #endif // CONNECTION_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Console.c b/src/Cedar/Console.c index 55b33fe5..f53e1095 100644 --- a/src/Cedar/Console.c +++ b/src/Cedar/Console.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -2237,6 +2237,7 @@ CONSOLE *NewLocalConsole(wchar_t *infile, wchar_t *outfile) c->ReadPassword = ConsoleLocalReadPassword;
c->Write = ConsoleLocalWrite;
c->GetWidth = ConsoleLocalGetWidth;
+ c->OutputLock = NewLock();
if (UniIsEmptyStr(infile) == false)
{
@@ -2348,6 +2349,8 @@ void ConsoleLocalFree(CONSOLE *c) Free(p);
}
+ DeleteLock(c->OutputLock);
+
// Memory release
Free(c);
}
@@ -2558,7 +2561,3 @@ void ConsoleWriteOutFile(CONSOLE *c, wchar_t *str, bool add_last_crlf) }
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Console.h b/src/Cedar/Console.h index ca195eeb..c16fbf54 100644 --- a/src/Cedar/Console.h +++ b/src/Cedar/Console.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -161,6 +161,7 @@ struct CONSOLE bool (*Write)(CONSOLE *c, wchar_t *str); // Function to write a string
UINT (*GetWidth)(CONSOLE *c); // Get the width of the screen
bool ProgrammingMode; // Programming Mode
+ LOCK *OutputLock; // Output Lock
};
// Local console parameters
@@ -247,7 +248,3 @@ UINT ConsoleLocalGetWidth(CONSOLE *c); -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/DDNS.c b/src/Cedar/DDNS.c index 85695bb3..a5f23b11 100644 --- a/src/Cedar/DDNS.c +++ b/src/Cedar/DDNS.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1046,7 +1046,3 @@ void DCGenNewKey(UCHAR *key) }
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/DDNS.h b/src/Cedar/DDNS.h index e9ef14b6..2251c296 100644 --- a/src/Cedar/DDNS.h +++ b/src/Cedar/DDNS.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -248,7 +248,3 @@ void DCGetInternetSetting(DDNS_CLIENT *c, INTERNET_SETTING *t); #endif // DDNS_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Database.c b/src/Cedar/Database.c index df1e793f..ea196f50 100644 --- a/src/Cedar/Database.c +++ b/src/Cedar/Database.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -263,7 +263,3 @@ bool LiIsLicenseKey(char *str) return true;
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Database.h b/src/Cedar/Database.h index 2b621fb7..0fa9e477 100644 --- a/src/Cedar/Database.h +++ b/src/Cedar/Database.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -122,7 +122,3 @@ bool LiStrToKeyBit(UCHAR *keybit, char *keystr); #endif // DATABASE_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/EM.c b/src/Cedar/EM.c index 5bdf634e..c0c74562 100644 --- a/src/Cedar/EM.c +++ b/src/Cedar/EM.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1500,7 +1500,3 @@ RETRY: }
#endif // WIN32
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/EM.h b/src/Cedar/EM.h index 9154a527..26a03e1d 100644 --- a/src/Cedar/EM.h +++ b/src/Cedar/EM.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -120,7 +120,3 @@ void EMExec(); #endif // EM_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/EMInner.h b/src/Cedar/EMInner.h index 43e87c2c..55c53335 100644 --- a/src/Cedar/EMInner.h +++ b/src/Cedar/EMInner.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -147,6 +147,3 @@ void EmLicenseAddDlgUpdate(HWND hWnd, RPC *s); void EmLicenseAddDlgShiftTextItem(HWND hWnd, UINT id1, UINT id2, UINT *next_focus);
void EmLicenseAddDlgGetText(HWND hWnd, char *str, UINT size);
void EmLicenseAddDlgOnOk(HWND hWnd, RPC *s);
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/EtherLog.c b/src/Cedar/EtherLog.c index e6eed581..f19a1a37 100644 --- a/src/Cedar/EtherLog.c +++ b/src/Cedar/EtherLog.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1380,7 +1380,3 @@ void ElFree() el_lock = NULL;
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/EtherLog.h b/src/Cedar/EtherLog.h index d6611eae..66177c8d 100644 --- a/src/Cedar/EtherLog.h +++ b/src/Cedar/EtherLog.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -279,7 +279,3 @@ void OutRpcElLicenseStatus(PACK *p, RPC_EL_LICENSE_STATUS *t); #endif // ETHERLOG_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Hub.c b/src/Cedar/Hub.c index 5aa36b5a..c10420ab 100644 --- a/src/Cedar/Hub.c +++ b/src/Cedar/Hub.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1227,12 +1227,6 @@ bool IsValidCertInHub(HUB *h, X *x) return false;
}
- if (IsXRevoked(x))
- {
- // Disabled by the CRL stored in the file
- return false;
- }
-
LockList(h->HubDb->CrlList);
{
ret = IsCertMatchCrlList(x, h->HubDb->CrlList);
@@ -7440,7 +7434,3 @@ HUBDB *NewHubDb() }
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Hub.h b/src/Cedar/Hub.h index bb6acfbd..9a1af13d 100644 --- a/src/Cedar/Hub.h +++ b/src/Cedar/Hub.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -648,7 +648,3 @@ EAP_CLIENT *HubNewEapClient(CEDAR *cedar, char *hubname, char *client_ip_str, ch #endif // HUB_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/IPsec.c b/src/Cedar/IPsec.c index ce48c43e..e3cb68a0 100644 --- a/src/Cedar/IPsec.c +++ b/src/Cedar/IPsec.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -793,7 +793,3 @@ IPSEC_SERVER *NewIPsecServer(CEDAR *cedar) return s;
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/IPsec.h b/src/Cedar/IPsec.h index ae3bc6cd..e62218ee 100644 --- a/src/Cedar/IPsec.h +++ b/src/Cedar/IPsec.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -203,7 +203,3 @@ void IPSecSetDisable(bool b); #endif // IPSEC_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/IPsec_EtherIP.c b/src/Cedar/IPsec_EtherIP.c index 82dd6d9a..573a205e 100644 --- a/src/Cedar/IPsec_EtherIP.c +++ b/src/Cedar/IPsec_EtherIP.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -563,7 +563,3 @@ UINT CalcEtherIPTcpMss(ETHERIP_SERVER *s) return ret;
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/IPsec_EtherIP.h b/src/Cedar/IPsec_EtherIP.h index 78bc9f0b..96dbeb5d 100644 --- a/src/Cedar/IPsec_EtherIP.h +++ b/src/Cedar/IPsec_EtherIP.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -174,7 +174,3 @@ UINT CalcEtherIPTcpMss(ETHERIP_SERVER *s); #endif // IPSEC_ETHERIP_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/IPsec_IKE.c b/src/Cedar/IPsec_IKE.c index eff09b78..47425432 100644 --- a/src/Cedar/IPsec_IKE.c +++ b/src/Cedar/IPsec_IKE.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -5987,7 +5987,3 @@ IKE_SERVER *NewIKEServer(CEDAR *cedar, IPSEC_SERVER *ipsec) -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/IPsec_IKE.h b/src/Cedar/IPsec_IKE.h index 4186d842..a6d2c2d5 100644 --- a/src/Cedar/IPsec_IKE.h +++ b/src/Cedar/IPsec_IKE.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -474,7 +474,3 @@ IKE_SA *SearchIkeSaByCookie(IKE_SERVER *ike, UINT64 init_cookie, UINT64 resp_coo #endif // IPSEC_IKE_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/IPsec_IPC.c b/src/Cedar/IPsec_IPC.c index 26d1163a..c21f43ba 100644 --- a/src/Cedar/IPsec_IPC.c +++ b/src/Cedar/IPsec_IPC.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -2117,7 +2117,3 @@ BLOCK *IPCRecvL2(IPC *ipc) -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/IPsec_IPC.h b/src/Cedar/IPsec_IPC.h index 260fcb6f..8c5a7f2e 100644 --- a/src/Cedar/IPsec_IPC.h +++ b/src/Cedar/IPsec_IPC.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -269,7 +269,3 @@ bool ParseAndExtractMsChapV2InfoFromPassword(IPC_MSCHAP_V2_AUTHINFO *d, char *pa -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/IPsec_IkePacket.c b/src/Cedar/IPsec_IkePacket.c index 0790403c..65b1bfbe 100644 --- a/src/Cedar/IPsec_IkePacket.c +++ b/src/Cedar/IPsec_IkePacket.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -2559,8 +2559,6 @@ IKE_ENGINE *NewIkeEngine() IKE_ENGINE *e = ZeroMalloc(sizeof(IKE_ENGINE));
IKE_CRYPTO *des, *des3, *aes;
IKE_HASH *sha1, *md5, *sha2_256, *sha2_384, *sha2_512;
- IKE_DH *dh1, *dh2, *dh5;
- IKE_HASH *sha1, *md5;
IKE_DH *dh1, *dh2, *dh5, *dh2048, *dh3072, *dh4096;
UINT des_key_sizes[] =
{
@@ -2965,26 +2963,12 @@ void IkeHash(IKE_HASH *h, void *dst, void *src, UINT size) // Calculation of HMAC
void IkeHMac(IKE_HASH *h, void *dst, void *key, UINT key_size, void *data, UINT data_size)
{
- UINT hmac_block_size;
- if (h == NULL) {
- return;
- }
- switch (h->HashId) {
- case IKE_HASH_SHA1_ID:
- case IKE_HASH_SHA2_256_ID:
- hmac_block_size = HMAC_BLOCK_SIZE;
- break;
- case IKE_HASH_SHA2_384_ID:
- case IKE_HASH_SHA2_512_ID:
- hmac_block_size = HMAC_BLOCK_SIZE_1024;
- break;
- default: return;
- }
- UCHAR k[hmac_block_size];
+ UINT hmac_block_size = HMAC_BLOCK_SIZE;
+ UCHAR k[HMAC_BLOCK_SIZE_MAX];
UCHAR *data1;
UCHAR hash1[IKE_MAX_HASH_SIZE];
UINT data1_size;
- UCHAR data2[IKE_MAX_HASH_SIZE + hmac_block_size];
+ UCHAR data2[IKE_MAX_HASH_SIZE + HMAC_BLOCK_SIZE_MAX];
UINT data2_size;
UCHAR tmp1600[1600];
bool no_free = false;
@@ -2995,25 +2979,31 @@ void IkeHMac(IKE_HASH *h, void *dst, void *key, UINT key_size, void *data, UINT return;
}
- if (h->HashId == IKE_HASH_SHA1_ID)
- {
- // Use special function (fast) in the case of SHA-1
- HMacSha1(dst, key, key_size, data, data_size);
- return;
- }
- else if (h->HashId == IKE_HASH_SHA2_256_ID)
+ switch (h->HashId)
{
- HMacSha2_256(dst, key, key_size, data, data_size);
- return;
+ case IKE_HASH_SHA1_ID:
+ case IKE_HASH_SHA2_256_ID:
+ hmac_block_size = HMAC_BLOCK_SIZE;
+ break;
+
+ case IKE_HASH_SHA2_384_ID:
+ case IKE_HASH_SHA2_512_ID:
+ hmac_block_size = HMAC_BLOCK_SIZE_1024;
+ break;
+
+ default:
+ return;
}
- else if (h->HashId == IKE_HASH_SHA2_384_ID)
+
+ if (hmac_block_size > HMAC_BLOCK_SIZE_MAX)
{
- HMacSha2_384(dst, key, key_size, data, data_size);
return;
}
- else if (h->HashId == IKE_HASH_SHA2_512_ID)
+
+ if (h->HashId == IKE_HASH_SHA1_ID)
{
- HMacSha2_512(dst, key, key_size, data, data_size);
+ // Use special function (fast) in the case of SHA-1
+ HMacSha1(dst, key, key_size, data, data_size);
return;
}
else if (h->HashId == IKE_HASH_MD5_ID)
@@ -3221,7 +3211,3 @@ void IkeDhFreeCtx(DH_CTX *dh) -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/IPsec_IkePacket.h b/src/Cedar/IPsec_IkePacket.h index e82925b6..92d95933 100644 --- a/src/Cedar/IPsec_IkePacket.h +++ b/src/Cedar/IPsec_IkePacket.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -224,6 +224,7 @@ struct IKE_TRANSFORM_VALUE } GCC_PACKED;
// The Type value in IKE transform value (Phase 1)
+// MUST BE LESS THAN "MAX_IKE_ENGINE_ELEMENTS" !!!
#define IKE_TRANSFORM_VALUE_P1_CRYPTO 1 // Encryption algorithm
#define IKE_TRANSFORM_VALUE_P1_HASH 2 // Hash algorithm
#define IKE_TRANSFORM_VALUE_P1_AUTH_METHOD 3 // Authentication method
@@ -233,6 +234,7 @@ struct IKE_TRANSFORM_VALUE #define IKE_TRANSFORM_VALUE_P1_KET_SIZE 14 // Key size
// The Type value in IKE transform values (Phase 2)
+// MUST BE LESS THAN "MAX_IKE_ENGINE_ELEMENTS" !!!
#define IKE_TRANSFORM_VALUE_P2_LIFE_TYPE 1 // Expiration date type
#define IKE_TRANSFORM_VALUE_P2_LIFE_VALUE 2 // Expiration date
#define IKE_TRANSFORM_VALUE_P2_DH_GROUP 3 // DH group number
@@ -241,6 +243,7 @@ struct IKE_TRANSFORM_VALUE #define IKE_TRANSFORM_VALUE_P2_KEY_SIZE 6 // Key size
// Phase 1: The encryption algorithm in the IKE transform value
+// MUST BE LESS THAN "MAX_IKE_ENGINE_ELEMENTS" !!!
#define IKE_P1_CRYPTO_DES_CBC 1
#define IKE_P1_CRYPTO_BLOWFISH 3
#define IKE_P1_CRYPTO_3DES_CBC 5
@@ -248,6 +251,7 @@ struct IKE_TRANSFORM_VALUE #define IKE_P1_CRYPTO_AES_CBC 7
// Phase 1: The hash algorithm in IKE transform value
+// MUST BE LESS THAN "MAX_IKE_ENGINE_ELEMENTS" !!!
#define IKE_P1_HASH_MD5 1
#define IKE_P1_HASH_SHA1 2
#define IKE_P1_HASH_SHA2_256 4
@@ -255,10 +259,12 @@ struct IKE_TRANSFORM_VALUE #define IKE_P1_HASH_SHA2_512 6
// Phase 1: The authentication method in the IKE transform value
+// MUST BE LESS THAN "MAX_IKE_ENGINE_ELEMENTS" !!!
#define IKE_P1_AUTH_METHOD_PRESHAREDKEY 1
#define IKE_P1_AUTH_METHOD_RSA_SIGN 3
// Phase 1: The DH group number in the IKE transform value
+// MUST BE LESS THAN "MAX_IKE_ENGINE_ELEMENTS" !!!
#define IKE_P1_DH_GROUP_768_MODP 1
#define IKE_P1_DH_GROUP_1024_MODP 2
#define IKE_P1_DH_GROUP_1536_MODP 5
@@ -267,14 +273,17 @@ struct IKE_TRANSFORM_VALUE #define IKE_P1_DH_GROUP_4096_MODP 16
// Phase 1: The expiration date type in IKE transform value
+// MUST BE LESS THAN "MAX_IKE_ENGINE_ELEMENTS" !!!
#define IKE_P1_LIFE_TYPE_SECONDS 1
#define IKE_P1_LIFE_TYPE_KILOBYTES 2
// Phase 2: The HMAC algorithm in IPsec transform value
+// MUST BE LESS THAN "MAX_IKE_ENGINE_ELEMENTS" !!!
#define IKE_P2_HMAC_MD5_96 1
#define IKE_P2_HMAC_SHA1_96 2
// Phase 2: The DH group number in the IPsec transform value
+// MUST BE LESS THAN "MAX_IKE_ENGINE_ELEMENTS" !!!
#define IKE_P2_DH_GROUP_768_MODP 1
#define IKE_P2_DH_GROUP_1024_MODP 2
#define IKE_P2_DH_GROUP_1536_MODP 5
@@ -605,7 +614,7 @@ struct IKE_DH UINT KeySize; // Key size
};
-#define MAX_IKE_ENGINE_ELEMENTS 16
+#define MAX_IKE_ENGINE_ELEMENTS 64
// Encryption engine for IKE
struct IKE_ENGINE
@@ -762,7 +771,3 @@ void IkeDhFreeCtx(DH_CTX *dh); #endif // IPSEC_PACKET_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/IPsec_L2TP.c b/src/Cedar/IPsec_L2TP.c index 4876c531..57f7eae2 100644 --- a/src/Cedar/IPsec_L2TP.c +++ b/src/Cedar/IPsec_L2TP.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -2709,7 +2709,3 @@ void SetL2TPServerSockEvent(L2TP_SERVER *l2tp, SOCK_EVENT *e) l2tp->SockEvent = e;
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/IPsec_L2TP.h b/src/Cedar/IPsec_L2TP.h index 7ae52e10..35f828bd 100644 --- a/src/Cedar/IPsec_L2TP.h +++ b/src/Cedar/IPsec_L2TP.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -381,7 +381,3 @@ void L2TPSessionManageEtherIPServer(L2TP_SERVER *l2tp, L2TP_SESSION *s); #endif // IPSEC_L2TP_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/IPsec_PPP.c b/src/Cedar/IPsec_PPP.c index 3dc9f24b..0e28982c 100644 --- a/src/Cedar/IPsec_PPP.c +++ b/src/Cedar/IPsec_PPP.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1751,10 +1751,13 @@ PPP_PACKET *PPPRecvResponsePacket(PPP_SESSION *p, PPP_PACKET *req, USHORT expect {
// Record current resend because next steps may take a while
UINT64 currentresend = next_resend - now;
+
// Process when the received packet is a request packet
response = PPPProcessRequestPacket(p, pp);
+
// Increase next resend because this may have taken a while
next_resend = Tick64() + currentresend;
+
FreePPPPacket(pp);
if (response == NULL)
@@ -2839,7 +2842,3 @@ char *MsChapV2DoBruteForce(IPC_MSCHAP_V2_AUTHINFO *d, LIST *password_list) -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/IPsec_PPP.h b/src/Cedar/IPsec_PPP.h index 61e5609a..c0cdc17a 100644 --- a/src/Cedar/IPsec_PPP.h +++ b/src/Cedar/IPsec_PPP.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -340,7 +340,3 @@ void PPPFreeEapClient(PPP_SESSION *p); #endif // IPSEC_PPP_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/IPsec_Win7.c b/src/Cedar/IPsec_Win7.c index 94a00df8..0010000d 100644 --- a/src/Cedar/IPsec_Win7.c +++ b/src/Cedar/IPsec_Win7.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -385,10 +385,17 @@ bool IPsecWin7InitDriverInner() // Copy the driver
if (FileCopy(src_filename, sys_filename) == false)
{
- Debug("%s copy failed.\n", sys_filename);
- return false;
+ Debug("%s copy failed. %u\n", sys_filename, GetLastError());
+ if (IsFileExists(sys_filename) == false)
+ {
+ Debug("%s failed. Abort.\n", sys_filename);
+ return false;
+ }
+ }
+ else
+ {
+ Debug("%s copied.\n", sys_filename);
}
- Debug("%s copied.\n", sys_filename);
// Set the build number
SetCurrentIPsecWin7DriverBuild();
@@ -566,7 +573,3 @@ bool IPsecWin7InitApi() #endif // WIN32
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/IPsec_Win7.h b/src/Cedar/IPsec_Win7.h index d33e344f..74d4f30e 100644 --- a/src/Cedar/IPsec_Win7.h +++ b/src/Cedar/IPsec_Win7.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -146,7 +146,3 @@ bool IPsecWin7InitApi(); -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/IPsec_Win7Inner.h b/src/Cedar/IPsec_Win7Inner.h index a0a44b80..5e35f654 100644 --- a/src/Cedar/IPsec_Win7Inner.h +++ b/src/Cedar/IPsec_Win7Inner.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -184,7 +184,3 @@ struct IPSEC_WIN7 -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Interop_OpenVPN.c b/src/Cedar/Interop_OpenVPN.c index 1eb57f82..90908822 100644 --- a/src/Cedar/Interop_OpenVPN.c +++ b/src/Cedar/Interop_OpenVPN.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1151,17 +1151,14 @@ UINT OvsParseKeyMethod2(OPENVPN_KEY_METHOD_2 *ret, UCHAR *data, UINT size, bool // Random2
if (ReadBuf(b, ret->Random2, sizeof(ret->Random2)) == sizeof(ret->Random2))
{
- // String
- if (OvsReadStringFromBuf(b, ret->OptionString, sizeof(ret->OptionString)) &&
- OvsReadStringFromBuf(b, ret->Username, sizeof(ret->Username)) &&
- OvsReadStringFromBuf(b, ret->Password, sizeof(ret->Password)))
- {
- if (!OvsReadStringFromBuf(b, ret->PeerInfo, sizeof(ret->PeerInfo)))
- {
- Zero(ret->PeerInfo, sizeof(ret->PeerInfo));
- }
- read_size = b->Current;
- }
+ // String
+ if (OvsReadStringFromBuf(b, ret->OptionString, sizeof(ret->OptionString)) &&
+ OvsReadStringFromBuf(b, ret->Username, sizeof(ret->Username)) &&
+ OvsReadStringFromBuf(b, ret->Password, sizeof(ret->Password)) &&
+ OvsReadStringFromBuf(b, ret->PeerInfo, sizeof(ret->PeerInfo)))
+ {
+ read_size = b->Current;
+ }
}
}
}
@@ -3019,7 +3016,3 @@ bool OvsPerformTcpServer(CEDAR *cedar, SOCK *sock) -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Interop_OpenVPN.h b/src/Cedar/Interop_OpenVPN.h index 934f7245..68efca96 100644 --- a/src/Cedar/Interop_OpenVPN.h +++ b/src/Cedar/Interop_OpenVPN.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -152,8 +152,7 @@ #define OPENVPN_IPC_POSTFIX_L3 "OPENVPN_L3"
// List of supported encryption algorithms
-#define OPENVPN_CIPHER_LIST "[NULL-CIPHER] NULL AES-128-CBC AES-192-CBC AES-256-CBC BF-CBC CAST-CBC CAST5-CBC \
- DES-CBC DES-EDE-CBC DES-EDE3-CBC DESX-CBC RC2-40-CBC RC2-64-CBC RC2-CBC CAMELLIA-128-CBC CAMELLIA-192-CBC CAMELLIA-256-CBC"
+#define OPENVPN_CIPHER_LIST "[NULL-CIPHER] NULL AES-128-CBC AES-192-CBC AES-256-CBC BF-CBC CAST-CBC CAST5-CBC DES-CBC DES-EDE-CBC DES-EDE3-CBC DESX-CBC RC2-40-CBC RC2-64-CBC RC2-CBC CAMELLIA-128-CBC CAMELLIA-192-CBC CAMELLIA-256-CBC"
// List of the supported hash algorithm
#define OPENVPN_MD_LIST "SHA SHA1 SHA256 SHA384 SHA512 MD5 MD4 RMD160"
@@ -390,7 +389,3 @@ void OvsSetNoOpenVpnUdp(bool b); #endif // INTEROP_OPENVPN_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Interop_SSTP.c b/src/Cedar/Interop_SSTP.c index 6ea60473..351b9fec 100644 --- a/src/Cedar/Interop_SSTP.c +++ b/src/Cedar/Interop_SSTP.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1248,7 +1248,3 @@ bool AcceptSstp(CONNECTION *c) return ret2;
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Interop_SSTP.h b/src/Cedar/Interop_SSTP.h index 39cf3273..ca3da72a 100644 --- a/src/Cedar/Interop_SSTP.h +++ b/src/Cedar/Interop_SSTP.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -262,7 +262,3 @@ void SetNoSstp(bool b); #endif // INTEROP_SSTP_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Layer3.c b/src/Cedar/Layer3.c index 16f5032e..3088ef9d 100644 --- a/src/Cedar/Layer3.c +++ b/src/Cedar/Layer3.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -2203,7 +2203,3 @@ int CmpL3ArpEntry(void *p1, void *p2) }
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Layer3.h b/src/Cedar/Layer3.h index f9163837..1d6625e8 100644 --- a/src/Cedar/Layer3.h +++ b/src/Cedar/Layer3.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -253,7 +253,3 @@ void L3PollingIpQueue(L3IF *f); -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Link.c b/src/Cedar/Link.c index 96982dd9..141f524b 100644 --- a/src/Cedar/Link.c +++ b/src/Cedar/Link.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -782,7 +782,3 @@ LINK *NewLink(CEDAR *cedar, HUB *hub, CLIENT_OPTION *option, CLIENT_AUTH *auth, return k;
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Link.h b/src/Cedar/Link.h index 6170d253..54316ca8 100644 --- a/src/Cedar/Link.h +++ b/src/Cedar/Link.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -169,7 +169,3 @@ void NormalizeLinkPolicy(POLICY *p); -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Listener.c b/src/Cedar/Listener.c index b6283208..71ddfc35 100644 --- a/src/Cedar/Listener.c +++ b/src/Cedar/Listener.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1103,7 +1103,3 @@ void ApplyDynamicListener(DYNAMIC_LISTENER *d) }
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Listener.h b/src/Cedar/Listener.h index 69172835..0a307107 100644 --- a/src/Cedar/Listener.h +++ b/src/Cedar/Listener.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -212,7 +212,3 @@ void ListenerSetProcRecvRpcEnable(bool b); #endif // LISTENER_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Logging.c b/src/Cedar/Logging.c index 69334b14..3480198d 100644 --- a/src/Cedar/Logging.c +++ b/src/Cedar/Logging.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -3017,7 +3017,3 @@ LOG *NewLog(char *dir, char *prefix, UINT switch_type) }
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Logging.h b/src/Cedar/Logging.h index 5457e514..8661d94e 100644 --- a/src/Cedar/Logging.h +++ b/src/Cedar/Logging.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -278,7 +278,3 @@ UINT64 GetMaxLogSize(); #endif // LOGGING_G
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/NM.c b/src/Cedar/NM.c index ac1b284a..dc7faff7 100644 --- a/src/Cedar/NM.c +++ b/src/Cedar/NM.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1641,7 +1641,3 @@ void NMExec() #endif
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/NM.h b/src/Cedar/NM.h index f378a594..8f6640d7 100644 --- a/src/Cedar/NM.h +++ b/src/Cedar/NM.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -120,7 +120,3 @@ void NMExec(); #endif // NM_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/NMInner.h b/src/Cedar/NMInner.h index fdea5ed8..42f032c4 100644 --- a/src/Cedar/NMInner.h +++ b/src/Cedar/NMInner.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -176,7 +176,3 @@ bool NmEditPushRoute(HWND hWnd, SM_HUB *r); UINT NmEditPushRouteProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, void *param);
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Nat.c b/src/Cedar/Nat.c index 13df95c7..809c695f 100644 --- a/src/Cedar/Nat.c +++ b/src/Cedar/Nat.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1916,7 +1916,3 @@ void NtFree() nat_lock = NULL;
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Nat.h b/src/Cedar/Nat.h index 5e03047c..9727682b 100644 --- a/src/Cedar/Nat.h +++ b/src/Cedar/Nat.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -316,7 +316,3 @@ void OutRpcDummy(PACK *p, RPC_DUMMY *t); #endif // NAT_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/NativeStack.c b/src/Cedar/NativeStack.c index b9060183..a2e65536 100644 --- a/src/Cedar/NativeStack.c +++ b/src/Cedar/NativeStack.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -999,7 +999,3 @@ bool IsIpTablesSupported() -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/NativeStack.h b/src/Cedar/NativeStack.h index a6a2657f..bf4bf592 100644 --- a/src/Cedar/NativeStack.h +++ b/src/Cedar/NativeStack.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -193,7 +193,3 @@ void GenerateDummyIp(PRAND *p, IP *ip); #endif // NATIVESTACK_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/NullLan.c b/src/Cedar/NullLan.c index cf48e715..9b31c3f2 100644 --- a/src/Cedar/NullLan.c +++ b/src/Cedar/NullLan.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -331,7 +331,3 @@ void NullPaFree(SESSION *s) }
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/NullLan.h b/src/Cedar/NullLan.h index 50f68664..701e18cd 100644 --- a/src/Cedar/NullLan.h +++ b/src/Cedar/NullLan.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -143,7 +143,3 @@ void NullGenerateMacAddress(UCHAR *mac, UINT id, UINT seq); -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Protocol.c b/src/Cedar/Protocol.c index 90342c74..a34d7902 100644 --- a/src/Cedar/Protocol.c +++ b/src/Cedar/Protocol.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -7311,7 +7311,3 @@ void GenerateRC4KeyPair(RC4_KEY_PAIR *k) Rand(k->ServerToClientKey, sizeof(k->ServerToClientKey));
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Protocol.h b/src/Cedar/Protocol.h index e608c0ce..810bab2f 100644 --- a/src/Cedar/Protocol.h +++ b/src/Cedar/Protocol.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -314,7 +314,3 @@ bool DownloadAndSaveIntermediateCertificatesIfNecessary(X *x); #endif // PROTOCOL_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Radius.c b/src/Cedar/Radius.c index 386a6955..19caad93 100644 --- a/src/Cedar/Radius.c +++ b/src/Cedar/Radius.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -2412,7 +2412,3 @@ BUF *RadiusEncryptPassword(char *password, UCHAR *random, UCHAR *secret, UINT se return buf;
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Radius.h b/src/Cedar/Radius.h index ba336486..20c804d5 100644 --- a/src/Cedar/Radius.h +++ b/src/Cedar/Radius.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -390,7 +390,3 @@ LIST *RadiusParseOptions(BUF *b); -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Remote.c b/src/Cedar/Remote.c index 46d2552d..834cf913 100644 --- a/src/Cedar/Remote.c +++ b/src/Cedar/Remote.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -472,7 +472,3 @@ RPC *StartRpcClient(SOCK *s, void *param) return r;
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Remote.h b/src/Cedar/Remote.h index 7023b601..cbd60fe6 100644 --- a/src/Cedar/Remote.h +++ b/src/Cedar/Remote.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -151,7 +151,3 @@ void RpcFree(RPC *rpc); #endif // REMOTE_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/SM.c b/src/Cedar/SM.c index 3ee2c1d9..3c0599d0 100644 --- a/src/Cedar/SM.c +++ b/src/Cedar/SM.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -20698,7 +20698,3 @@ void SMExec() #endif // WIN32
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/SM.h b/src/Cedar/SM.h index 62f35af2..a7d51298 100644 --- a/src/Cedar/SM.h +++ b/src/Cedar/SM.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -119,7 +119,3 @@ void SMExec(); #endif // SM_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/SMInner.h b/src/Cedar/SMInner.h index 7b103cf4..577ceffa 100644 --- a/src/Cedar/SMInner.h +++ b/src/Cedar/SMInner.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -828,7 +828,3 @@ void SmProxyDlgInit(HWND hWnd, INTERNET_SETTING *t); void SmProxyDlgUpdate(HWND hWnd, INTERNET_SETTING *t);
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/SW.c b/src/Cedar/SW.c index 9ed2a104..4c80638b 100644 --- a/src/Cedar/SW.c +++ b/src/Cedar/SW.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -6677,7 +6677,3 @@ UINT SWExecMain() -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/SW.h b/src/Cedar/SW.h index afdc59c1..58250feb 100644 --- a/src/Cedar/SW.h +++ b/src/Cedar/SW.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -129,7 +129,3 @@ bool SwWaitForVpnClientPortReady(UINT timeout); #endif // SW_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/SWInner.h b/src/Cedar/SWInner.h index 13db4bb4..58445a37 100644 --- a/src/Cedar/SWInner.h +++ b/src/Cedar/SWInner.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -450,7 +450,3 @@ bool SwSfxCopyVgFiles(HWND hWnd, wchar_t *src, wchar_t *dst); #endif // SW_INNER_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Sam.c b/src/Cedar/Sam.c index 137cb61b..d859bae7 100644 --- a/src/Cedar/Sam.c +++ b/src/Cedar/Sam.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -708,7 +708,3 @@ UINT SamGetUserAuthType(HUB *h, char *username) return authtype;
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Sam.h b/src/Cedar/Sam.h index ca14cb26..8cde7ff9 100644 --- a/src/Cedar/Sam.h +++ b/src/Cedar/Sam.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -130,7 +130,3 @@ X *GetIssuerFromList(LIST *cert_list, X *cert); #endif // SAM_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/SeLowUser.c b/src/Cedar/SeLowUser.c index 1088aff9..dc807e52 100644 --- a/src/Cedar/SeLowUser.c +++ b/src/Cedar/SeLowUser.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1083,7 +1083,3 @@ void SuFree(SU *u) #endif // WIN32
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/SeLowUser.h b/src/Cedar/SeLowUser.h index 3d677e98..2a3fe057 100644 --- a/src/Cedar/SeLowUser.h +++ b/src/Cedar/SeLowUser.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -184,7 +184,3 @@ bool SuUnloadDriversHive(); -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/SecureInfo.c b/src/Cedar/SecureInfo.c index 1294ae51..190f8204 100644 --- a/src/Cedar/SecureInfo.c +++ b/src/Cedar/SecureInfo.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -114,7 +114,3 @@ #include "CedarPch.h"
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/SecureInfo.h b/src/Cedar/SecureInfo.h index 2f9d7550..89c4b2b0 100644 --- a/src/Cedar/SecureInfo.h +++ b/src/Cedar/SecureInfo.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -118,7 +118,3 @@ #endif // SECUREINFO_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/SecureNAT.c b/src/Cedar/SecureNAT.c index fcef16c3..6272a504 100644 --- a/src/Cedar/SecureNAT.c +++ b/src/Cedar/SecureNAT.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -252,7 +252,3 @@ SNAT *SnNewSecureNAT(HUB *h, VH_OPTION *o) return s;
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/SecureNAT.h b/src/Cedar/SecureNAT.h index 4f2d6f48..9299ada4 100644 --- a/src/Cedar/SecureNAT.h +++ b/src/Cedar/SecureNAT.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -132,7 +132,3 @@ void SnSecureNATThread(THREAD *t, void *param); #endif // SECURENAT_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Server.c b/src/Cedar/Server.c index 191fc147..feb486e9 100644 --- a/src/Cedar/Server.c +++ b/src/Cedar/Server.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -923,7 +923,11 @@ void SiWriteSysLog(SERVER *s, char *typestr, char *hubname, wchar_t *message) // Date and time
LocalTime(&st);
- GetDateTimeStrMilli(datetime, sizeof(datetime), &st);
+ if(s->StrictSyslogDatetimeFormat){
+ GetDateTimeStrRFC3164(datetime, sizeof(datetime), &st, GetCurrentTimezone());
+ }else{
+ GetDateTimeStrMilli(datetime, sizeof(datetime), &st);
+ }
if (IsEmptyStr(hubname) == false)
{
@@ -936,6 +940,8 @@ void SiWriteSysLog(SERVER *s, char *typestr, char *hubname, wchar_t *message) machinename, datetime, typestr, message);
}
+ Debug("Syslog send: %S\n",tmp);
+
SendSysLog(s->Syslog, tmp);
}
@@ -6177,6 +6183,8 @@ void SiLoadServerCfg(SERVER *s, FOLDER *f) c->SslAcceptSettings.Tls_Disable1_0 = CfgGetBool(f, "Tls_Disable1_0");
c->SslAcceptSettings.Tls_Disable1_1 = CfgGetBool(f, "Tls_Disable1_1");
c->SslAcceptSettings.Tls_Disable1_2 = CfgGetBool(f, "Tls_Disable1_2");
+
+ s->StrictSyslogDatetimeFormat = CfgGetBool(f, "StrictSyslogDatetimeFormat");
}
Unlock(c->lock);
@@ -6492,6 +6500,8 @@ void SiWriteServerCfg(FOLDER *f, SERVER *s) // Disable session reconnect
CfgAddBool(f, "DisableSessionReconnect", GetGlobalServerFlag(GSF_DISABLE_SESSION_RECONNECT));
+
+ CfgAddBool(f, "StrictSyslogDatetimeFormat", s->StrictSyslogDatetimeFormat);
}
Unlock(c->lock);
}
@@ -11067,7 +11077,3 @@ SERVER *SiNewServerEx(bool bridge, bool in_client_inner_server, bool relay_serve return s;
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Server.h b/src/Cedar/Server.h index 547df580..44fae171 100644 --- a/src/Cedar/Server.h +++ b/src/Cedar/Server.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -129,7 +129,7 @@ #define SERVER_DEF_PORTS_INCLIENT_DYN_MAX 1999
extern char *SERVER_CONFIG_FILE_NAME;
-#define SERVER_DEFAULT_CIPHER_NAME "RC4-MD5"
+#define SERVER_DEFAULT_CIPHER_NAME "AES128-SHA"
#define SERVER_DEFAULT_CERT_DAYS (365 * 10)
#define SERVER_DEFAULT_HUB_NAME "DEFAULT"
#define SERVER_DEFAULT_BRIDGE_NAME "BRIDGE"
@@ -367,6 +367,8 @@ struct SERVER volatile UINT NatTGlobalUdpPort; // NAT-T global UDP port
+
+ bool StrictSyslogDatetimeFormat; // Make syslog datetime format strict RFC3164
};
@@ -748,7 +750,3 @@ bool SiCheckCurrentRegion(CEDAR *c, char *r); -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Session.c b/src/Cedar/Session.c index 580e67d1..49ef3345 100644 --- a/src/Cedar/Session.c +++ b/src/Cedar/Session.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -2484,7 +2484,3 @@ void Notify(SESSION *s, UINT code) }
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Session.h b/src/Cedar/Session.h index 87a2223d..03854225 100644 --- a/src/Cedar/Session.h +++ b/src/Cedar/Session.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -443,7 +443,3 @@ UINT GetNextDelayedPacketTickDiff(SESSION *s); -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/UT.c b/src/Cedar/UT.c index d9f7ab32..a422b00d 100644 --- a/src/Cedar/UT.c +++ b/src/Cedar/UT.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -417,7 +417,3 @@ void UtSpeedMeterEx(void *hWnd) #endif // WIN32
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/UT.h b/src/Cedar/UT.h index 91d6290b..61ca771d 100644 --- a/src/Cedar/UT.h +++ b/src/Cedar/UT.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -136,7 +136,3 @@ void UtSpeedMeterEx(void *hWnd); #endif // UT_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/UdpAccel.c b/src/Cedar/UdpAccel.c index 842dc24b..e78fa676 100644 --- a/src/Cedar/UdpAccel.c +++ b/src/Cedar/UdpAccel.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1200,7 +1200,3 @@ void FreeUdpAccel(UDP_ACCEL *a) Free(a);
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/UdpAccel.h b/src/Cedar/UdpAccel.h index b22ccc9d..2ffd7154 100644 --- a/src/Cedar/UdpAccel.h +++ b/src/Cedar/UdpAccel.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -220,7 +220,3 @@ void NatT_GetIpThread(THREAD *thread, void *param); #endif // UDPACCEL_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/VG.c b/src/Cedar/VG.c index 77aa6c2b..f65975c7 100644 --- a/src/Cedar/VG.c +++ b/src/Cedar/VG.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -129,7 +129,3 @@ void VgUseStaticLink() -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/VG.h b/src/Cedar/VG.h index 9595eee5..986feaf2 100644 --- a/src/Cedar/VG.h +++ b/src/Cedar/VG.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -125,7 +125,3 @@ void VgUseStaticLink(); -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/VLan.c b/src/Cedar/VLan.c index 6e262b0d..25d53af1 100644 --- a/src/Cedar/VLan.c +++ b/src/Cedar/VLan.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -132,7 +132,3 @@ #endif // OS_WIN32
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/VLan.h b/src/Cedar/VLan.h index 988f208c..3b07b6f3 100644 --- a/src/Cedar/VLan.h +++ b/src/Cedar/VLan.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -136,7 +136,3 @@ struct VLAN_PARAM #endif // VLAN_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/VLanUnix.c b/src/Cedar/VLanUnix.c index 0d381809..ff4b00fa 100644 --- a/src/Cedar/VLanUnix.c +++ b/src/Cedar/VLanUnix.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -857,7 +857,3 @@ void UnixVLanFree() #endif // VLAN_C
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/VLanUnix.h b/src/Cedar/VLanUnix.h index ab9b5d67..6f0c40b2 100644 --- a/src/Cedar/VLanUnix.h +++ b/src/Cedar/VLanUnix.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -168,7 +168,3 @@ int UnixCompareVLan(void *p1, void *p2); #endif // VLANUNIX_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/VLanWin32.c b/src/Cedar/VLanWin32.c index ac9eef7e..4e3faef5 100644 --- a/src/Cedar/VLanWin32.c +++ b/src/Cedar/VLanWin32.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1618,7 +1618,3 @@ CLEANUP: #endif //VLAN_C
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/VLanWin32.h b/src/Cedar/VLanWin32.h index 9833deee..f8860b6b 100644 --- a/src/Cedar/VLanWin32.h +++ b/src/Cedar/VLanWin32.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -198,7 +198,3 @@ void Win32ReleaseAllDhcp9x(bool wait); void Win32GetWinVer(RPC_WINVER *v);
#endif // VLANWIN32_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Virtual.c b/src/Cedar/Virtual.c index 16e45436..c757f240 100644 --- a/src/Cedar/Virtual.c +++ b/src/Cedar/Virtual.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1775,7 +1775,7 @@ void NnMainLoop(NATIVE_NAT *t, NATIVE_STACK *a) AddInterrupt(interrupt, next_poll_tick);
tcp_last_recv_tick = Tick64();
- next_dhcp_renew_tick = Tick64() + (UINT64)dhcp_renew_interval;
+ next_dhcp_renew_tick = Tick64() + (UINT64)dhcp_renew_interval * 1000;
AddInterrupt(interrupt, next_dhcp_renew_tick);
while (t->Halt == false && t->v->UseNat)
@@ -1833,7 +1833,7 @@ LABEL_RESTART: IPCDhcpRenewIP(ipc, &ip);
- next_dhcp_renew_tick = now + (UINT64)dhcp_renew_interval;
+ next_dhcp_renew_tick = now + (UINT64)dhcp_renew_interval * 1000;
AddInterrupt(interrupt, next_dhcp_renew_tick);
}
@@ -10421,7 +10421,3 @@ PACKET_ADAPTER *VirtualGetPacketAdapter() }
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Virtual.h b/src/Cedar/Virtual.h index 5e3cbc45..aecca935 100644 --- a/src/Cedar/Virtual.h +++ b/src/Cedar/Virtual.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -698,7 +698,3 @@ void NnSetSecureNatTargetHostname(char *name); #endif // VIRTUAL_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/WaterMark.c b/src/Cedar/WaterMark.c index be471826..bae7c626 100644 --- a/src/Cedar/WaterMark.c +++ b/src/Cedar/WaterMark.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -4410,7 +4410,3 @@ UINT SizeOfSaitama() -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/WaterMark.h b/src/Cedar/WaterMark.h index 40009d85..c68b0b05 100644 --- a/src/Cedar/WaterMark.h +++ b/src/Cedar/WaterMark.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -134,7 +134,3 @@ UINT SizeOfSaitama(); #endif // WATERMARK_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/WebUI.c b/src/Cedar/WebUI.c index d188911c..c989315d 100644 --- a/src/Cedar/WebUI.c +++ b/src/Cedar/WebUI.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1987,7 +1987,3 @@ static WU_CONTEXT *WuGetContext(LIST *contexts, char *sessionkey) }
return ret;
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/WebUI.h b/src/Cedar/WebUI.h index 3d0e2e43..7d3caeb8 100644 --- a/src/Cedar/WebUI.h +++ b/src/Cedar/WebUI.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -143,7 +143,3 @@ WEBUI *WuNewWebUI(CEDAR *cedar); WU_WEBPAGE *WuGetPage(char *target, WEBUI *wu);
void WuFreeWebPage(WU_WEBPAGE *page);
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Win32Com.cpp b/src/Cedar/Win32Com.cpp index bc691b74..364c146a 100644 --- a/src/Cedar/Win32Com.cpp +++ b/src/Cedar/Win32Com.cpp @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1131,7 +1131,3 @@ void ShowHtml(HWND hWnd, char *url, wchar_t *option) }
#endif
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Win32Com.h b/src/Cedar/Win32Com.h index bc6f5920..76a7a29d 100644 --- a/src/Cedar/Win32Com.h +++ b/src/Cedar/Win32Com.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -426,7 +426,3 @@ public: #endif // WIN32COM_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/WinJumpList.cpp b/src/Cedar/WinJumpList.cpp index 3de29c11..039a196f 100644 --- a/src/Cedar/WinJumpList.cpp +++ b/src/Cedar/WinJumpList.cpp @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -783,7 +783,3 @@ CT_ARGB32 CT_GetAAPix32(UCHAR* srcPtr, int width, int height, int xFix, int yFix //
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/WinUi.c b/src/Cedar/WinUi.c index c0d0d7a7..8c24091a 100644 --- a/src/Cedar/WinUi.c +++ b/src/Cedar/WinUi.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -11481,7 +11481,3 @@ void FreeWinUi() }
#endif // WIN32
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/WinUi.h b/src/Cedar/WinUi.h index 7225ee2d..3cc9ce53 100644 --- a/src/Cedar/WinUi.h +++ b/src/Cedar/WinUi.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -934,7 +934,3 @@ void ShowTextFile(HWND hWnd, char *filename, wchar_t *caption, UINT icon); #endif // OS_WIN32
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Wpc.c b/src/Cedar/Wpc.c index f10019dd..1e2f9731 100644 --- a/src/Cedar/Wpc.c +++ b/src/Cedar/Wpc.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1409,7 +1409,3 @@ void EncodeSafe64(char *dst, void *src, UINT src_size) Base64ToSafe64(dst);
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Cedar/Wpc.h b/src/Cedar/Wpc.h index 5204057b..8478ce8f 100644 --- a/src/Cedar/Wpc.h +++ b/src/Cedar/Wpc.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -237,7 +237,3 @@ bool IsProxyPrivateIp(INTERNET_SETTING *s); #endif // WPC_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/CurrentBuild.txt b/src/CurrentBuild.txt index 051da76f..a92b5501 100644 --- a/src/CurrentBuild.txt +++ b/src/CurrentBuild.txt @@ -1,4 +1,4 @@ -BUILD_NUMBER 9634
-VERSION 422
+BUILD_NUMBER 9647
+VERSION 423
BUILD_NAME beta
-BUILD_DATE 20161127_143359
+BUILD_DATE 20171018_163044
diff --git a/src/GlobalConst.h b/src/GlobalConst.h index ff33640f..0f861bf8 100644 --- a/src/GlobalConst.h +++ b/src/GlobalConst.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -175,7 +175,3 @@ #endif // GLOBAL_CONST_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/LICENSE.TXT b/src/LICENSE.TXT index fe75456e..a93edd01 100644 --- a/src/LICENSE.TXT +++ b/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-2016 Daiyuu Nobori.
-Copyright (c) 2012-2016 SoftEther Project at University of Tsukuba, Japan.
-Copyright (c) 2012-2016 SoftEther Corporation.
+Copyright (c) Daiyuu Nobori.
+Copyright (c) SoftEther Project at University of Tsukuba, Japan.
+Copyright (c) SoftEther Corporation.
All Rights Reserved.
http://www.softether.org/
diff --git a/src/Mayaqua/Cfg.c b/src/Mayaqua/Cfg.c index 829ad53a..68de8c4a 100644 --- a/src/Mayaqua/Cfg.c +++ b/src/Mayaqua/Cfg.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -2427,7 +2427,3 @@ FOLDER *CfgCreateFolder(FOLDER *parent, char *name) }
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/Cfg.h b/src/Mayaqua/Cfg.h index 793f1113..f84f79d1 100644 --- a/src/Mayaqua/Cfg.h +++ b/src/Mayaqua/Cfg.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -275,7 +275,3 @@ ITEM *CfgAddIp(FOLDER *f, char *name, struct IP *ip); -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/Encrypt.c b/src/Mayaqua/Encrypt.c index 587e5f68..a92b5224 100644 --- a/src/Mayaqua/Encrypt.c +++ b/src/Mayaqua/Encrypt.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -390,50 +390,14 @@ void HMacMd5(void *dst, void *key, UINT key_size, void *data, UINT data_size) MD5_Final(dst, &md5_ctx1);
}
-void HMacSha1(void *dst, void *key, UINT key_size, void *data, UINT data_size) {
- HMacSha(SHA1_160, dst, key, key_size, data, data_size);
-}
-
-void HMacSha2_256(void *dst, void *key, UINT key_size, void *data, UINT data_size) {
- HMacSha(SHA2_256, dst, key, key_size, data, data_size);
-}
-
-void HMacSha2_384(void *dst, void *key, UINT key_size, void *data, UINT data_size) {
- HMacSha(SHA2_384, dst, key, key_size, data, data_size);
-}
-
-void HMacSha2_512(void *dst, void *key, UINT key_size, void *data, UINT data_size) {
- HMacSha(SHA2_512, dst, key, key_size, data, data_size);
-}
-
// Calculation of HMAC (SHA-1)
-void HMacSha(UINT sha_type, void *dst, void *key, UINT key_size, void *data, UINT data_size)
+void HMacSha1(void *dst, void *key, UINT key_size, void *data, UINT data_size)
{
- UINT hmac_block_size;
- void* sha_ctx1;
- switch(sha_type) {
- case SHA1_160:
- sha_ctx1 = ZeroMalloc(sizeof(SHA_CTX));
- hmac_block_size = HMAC_BLOCK_SIZE;
- break;
- case SHA2_256:
- sha_ctx1 = ZeroMalloc(sizeof(SHA256_CTX));
- hmac_block_size = HMAC_BLOCK_SIZE;
- break;
- case SHA2_384:
- case SHA2_512:
- sha_ctx1 = ZeroMalloc(sizeof(SHA512_CTX));
- hmac_block_size = HMAC_BLOCK_SIZE_1024;
- break;
- default:
- return;
- }
-
- UCHAR k[hmac_block_size];
- UCHAR hash1[hmac_block_size];
- UCHAR data2[hmac_block_size];
- //SHA_CTX sha_ctx1;
- UCHAR pad1[hmac_block_size];
+ UCHAR k[HMAC_BLOCK_SIZE];
+ UCHAR hash1[SHA1_SIZE];
+ UCHAR data2[HMAC_BLOCK_SIZE];
+ SHA_CTX sha_ctx1;
+ UCHAR pad1[HMAC_BLOCK_SIZE];
UINT i;
// Validate arguments
if (dst == NULL || (key == NULL && key_size != 0) || (data == NULL && data_size != 0))
@@ -441,15 +405,14 @@ void HMacSha(UINT sha_type, void *dst, void *key, UINT key_size, void *data, UIN return;
}
-
// Creating a K
- if (key_size <= hmac_block_size)
+ if (key_size <= HMAC_BLOCK_SIZE)
{
for (i = 0;i < key_size;i++)
{
pad1[i] = ((UCHAR *)key)[i] ^ 0x36;
}
- for (i = key_size;i < hmac_block_size;i++)
+ for (i = key_size;i < HMAC_BLOCK_SIZE;i++)
{
pad1[i] = 0 ^ 0x36;
}
@@ -459,89 +422,41 @@ void HMacSha(UINT sha_type, void *dst, void *key, UINT key_size, void *data, UIN Zero(k, sizeof(k));
HashSha1(k, key, key_size);
- for (i = 0;i < hmac_block_size;i++)
+ for (i = 0;i < HMAC_BLOCK_SIZE;i++)
{
pad1[i] = k[i] ^ 0x36;
}
}
- switch(sha_type) {
- case SHA1_160:
- SHA1_Init((SHA_CTX *)sha_ctx1);
- SHA1_Update((SHA_CTX *)sha_ctx1, pad1, sizeof(pad1));
- SHA1_Update((SHA_CTX *)sha_ctx1, data, data_size);
- SHA1_Final(hash1, (SHA_CTX *)sha_ctx1);
- break;
- case SHA2_256:
- SHA256_Init((SHA256_CTX *)sha_ctx1);
- SHA256_Update((SHA256_CTX *)sha_ctx1, pad1, sizeof(pad1));
- SHA256_Update((SHA256_CTX *)sha_ctx1, data, data_size);
- SHA256_Final(hash1, (SHA256_CTX *)sha_ctx1);
- break;
- case SHA2_384:
- SHA384_Init((SHA512_CTX *)sha_ctx1);
- SHA384_Update((SHA512_CTX *)sha_ctx1, pad1, sizeof(pad1));
- SHA384_Update((SHA512_CTX *)sha_ctx1, data, data_size);
- SHA384_Final(hash1, (SHA512_CTX *)sha_ctx1);
- break;
- case SHA2_512:
- SHA512_Init((SHA512_CTX *)sha_ctx1);
- SHA512_Update((SHA512_CTX *)sha_ctx1, pad1, sizeof(pad1));
- SHA512_Update((SHA512_CTX *)sha_ctx1, data, data_size);
- SHA512_Final(hash1, (SHA512_CTX *)sha_ctx1);
- break;
- }
-
+ SHA1_Init(&sha_ctx1);
+ SHA1_Update(&sha_ctx1, pad1, sizeof(pad1));
+ SHA1_Update(&sha_ctx1, data, data_size);
+ SHA1_Final(hash1, &sha_ctx1);
// Generation of data 2
- if (key_size <= hmac_block_size)
+ if (key_size <= HMAC_BLOCK_SIZE)
{
for (i = 0;i < key_size;i++)
{
data2[i] = ((UCHAR *)key)[i] ^ 0x5c;
}
- for (i = key_size;i < hmac_block_size;i++)
+ for (i = key_size;i < HMAC_BLOCK_SIZE;i++)
{
data2[i] = 0 ^ 0x5c;
}
}
else
{
- for (i = 0;i < hmac_block_size;i++)
+ for (i = 0;i < HMAC_BLOCK_SIZE;i++)
{
data2[i] = k[i] ^ 0x5c;
}
}
- switch(sha_type) {
- case SHA1_160:
- SHA1_Init((SHA_CTX *)sha_ctx1);
- SHA1_Update((SHA_CTX *)sha_ctx1, data2, hmac_block_size);
- SHA1_Update((SHA_CTX *)sha_ctx1, hash1, SHA1_SIZE);
- SHA1_Final(dst, (SHA_CTX *)sha_ctx1);
- break;
- case SHA2_256:
- SHA256_Init((SHA256_CTX *)sha_ctx1);
- SHA256_Update((SHA256_CTX *)sha_ctx1, data2, hmac_block_size);
- SHA256_Update((SHA256_CTX *)sha_ctx1, hash1, SHA256_SIZE);
- SHA256_Final(dst, (SHA256_CTX *)sha_ctx1);
- break;
- case SHA2_384:
- SHA384_Init((SHA512_CTX *)sha_ctx1);
- SHA384_Update((SHA512_CTX *)sha_ctx1, data2, hmac_block_size);
- SHA384_Update((SHA512_CTX *)sha_ctx1, hash1, SHA384_SIZE);
- SHA384_Final(dst, (SHA512_CTX *)sha_ctx1);
- break;
-
- case SHA2_512:
- SHA512_Init((SHA512_CTX *)sha_ctx1);
- SHA512_Update((SHA512_CTX *)sha_ctx1, data2, hmac_block_size);
- SHA512_Update((SHA512_CTX *)sha_ctx1, hash1, SHA512_SIZE);
- SHA512_Final(dst, (SHA512_CTX *)sha_ctx1);
- break;
- }
- Free(sha_ctx1);
-
+ SHA1_Init(&sha_ctx1);
+ SHA1_Update(&sha_ctx1, data2, HMAC_BLOCK_SIZE);
+ SHA1_Update(&sha_ctx1, hash1, SHA1_SIZE);
+ SHA1_Final(dst, &sha_ctx1);
}
// Calculate the HMAC
@@ -570,7 +485,7 @@ void SetMdKey(MD *md, void *key, UINT key_size) return;
}
- HMAC_Init_ex(md->Ctx, key, key_size, md->Md, NULL);
+ HMAC_Init_ex(md->Ctx, key, key_size, (const EVP_MD *)md->Md, NULL);
}
// Creating a message digest object
@@ -586,7 +501,7 @@ MD *NewMd(char *name) m = ZeroMalloc(sizeof(MD));
StrCpy(m->Name, sizeof(m->Name), name);
- m->Md = EVP_get_digestbyname(name);
+ m->Md = (const struct evp_md_st *)EVP_get_digestbyname(name);
if (m->Md == NULL)
{
FreeMd(m);
@@ -600,7 +515,7 @@ MD *NewMd(char *name) HMAC_CTX_init(m->Ctx);
#endif
- m->Size = EVP_MD_size(m->Md);
+ m->Size = EVP_MD_size((const EVP_MD *)m->Md);
return m;
}
@@ -749,175 +664,6 @@ void FreeCipher(CIPHER *c) Free(c);
}
-// Verify whether the certificate is disabled by CRL in a particular directory
-bool IsXRevoked(X *x)
-{
- char dirname[MAX_PATH];
- UINT i;
- bool ret = false;
- DIRLIST *t;
- // Validate arguments
- if (x == NULL)
- {
- return false;
- }
-
- GetExeDir(dirname, sizeof(dirname));
-
- // Search the CRL file
- t = EnumDir(dirname);
-
- for (i = 0;i < t->NumFiles;i++)
- {
- char *name = t->File[i]->FileName;
- if (t->File[i]->Folder == false)
- {
- if (EndWith(name, ".crl"))
- {
- char filename[MAX_PATH];
- X_CRL *r;
-
- ConbinePath(filename, sizeof(filename), dirname, name);
-
- r = FileToXCrl(filename);
-
- if (r != NULL)
- {
- if (IsXRevokedByXCrl(x, r))
- {
- ret = true;
- }
-
- FreeXCrl(r);
- }
- }
- }
- }
-
- FreeDir(t);
-
- return ret;
-}
-
-// Verify whether the certificate is disabled by the CRL
-bool IsXRevokedByXCrl(X *x, X_CRL *r)
-{
-#ifdef OS_WIN32
- X509_REVOKED tmp;
- X509_CRL_INFO *info;
- int index;
- // Validate arguments
- if (x == NULL || r == NULL)
- {
- return false;
- }
-
- Zero(&tmp, sizeof(tmp));
- tmp.serialNumber = X509_get_serialNumber(x->x509);
-
- info = r->Crl->crl;
-
- if (sk_X509_REVOKED_is_sorted(info->revoked) == false)
- {
- sk_X509_REVOKED_sort(info->revoked);
- }
-
- index = sk_X509_REVOKED_find(info->revoked, &tmp);
-
- if (index < 0)
- {
- return false;
- }
- else
- {
- return true;
- }
-#else // OS_WIN32
- return false;
-#endif // OS_WIN32
-}
-
-// Release of the CRL
-void FreeXCrl(X_CRL *r)
-{
- // Validate arguments
- if (r == NULL)
- {
- return;
- }
-
- X509_CRL_free(r->Crl);
-
- Free(r);
-}
-
-// Convert a file to a CRL
-X_CRL *FileToXCrl(char *filename)
-{
- wchar_t *filename_w = CopyStrToUni(filename);
- X_CRL *ret = FileToXCrlW(filename_w);
-
- Free(filename_w);
-
- return ret;
-}
-X_CRL *FileToXCrlW(wchar_t *filename)
-{
- BUF *b;
- X_CRL *r;
- // Validate arguments
- if (filename == NULL)
- {
- return NULL;
- }
-
- b = ReadDumpW(filename);
- if (b == NULL)
- {
- return NULL;
- }
-
- r = BufToXCrl(b);
-
- FreeBuf(b);
-
- return r;
-}
-
-// Convert the buffer to the CRL
-X_CRL *BufToXCrl(BUF *b)
-{
- X_CRL *r;
- X509_CRL *x509crl;
- BIO *bio;
- // Validate arguments
- if (b == NULL)
- {
- return NULL;
- }
-
- bio = BufToBio(b);
- if (bio == NULL)
- {
- return NULL;
- }
-
- x509crl = NULL;
-
- if (d2i_X509_CRL_bio(bio, &x509crl) == NULL || x509crl == NULL)
- {
- FreeBio(bio);
- return NULL;
- }
-
- r = ZeroMalloc(sizeof(X_CRL));
- r->Crl = x509crl;
-
- FreeBio(bio);
-
- return r;
-}
-
// Convert the buffer to the public key
K *RsaBinToPublic(void *data, UINT size)
{
@@ -2535,8 +2281,8 @@ void LoadXDates(X *x) return;
}
- x->notBefore = Asn1TimeToUINT64(X509_get0_notBefore(x->x509));
- x->notAfter = Asn1TimeToUINT64(X509_get0_notAfter(x->x509));
+ x->notBefore = Asn1TimeToUINT64((ASN1_TIME *)X509_get0_notBefore(x->x509));
+ x->notAfter = Asn1TimeToUINT64((ASN1_TIME *)X509_get0_notAfter(x->x509));
}
// Convert the 64bit system time to ASN1 time
@@ -4165,9 +3911,13 @@ X *X509ToX(X509 *x509) x->is_compatible_bit = true;
if(x->bits != 1024 && x->bits != 1536 && x->bits != 2048 && x->bits != 3072 && x->bits != 4096)
+ {
x->is_compatible_bit = false;
+ }
else
+ {
x->is_compatible_bit = true;
+ }
/*switch (size)
{
@@ -4231,7 +3981,7 @@ BUF *BioToBuf(BIO *bio) }
BIO_seek(bio, 0);
- size = BIO_number_written(bio);
+ size = (UINT)BIO_number_written(bio);
tmp = Malloc(size);
BIO_read(bio, tmp, size);
@@ -4534,7 +4284,20 @@ void Sha(UINT sha_type, void *dst, void *src, UINT size) }
-void Sha1(void *dst, void *src, UINT size) {
+
+// SHA-1 hash
+void Sha1(void *dst, void *src, UINT size)
+{
+ // Validate arguments
+ if (dst == NULL || src == NULL)
+ {
+ return;
+ }
+
+ SHA1(src, size, dst);
+}
+
+void Sha1__(void *dst, void *src, UINT size) {
Sha(SHA1_160, dst, src, size);
}
@@ -5545,8 +5308,3 @@ static unsigned char *Internal_SHA0(const unsigned char *d, size_t n, unsigned c -
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/Encrypt.h b/src/Mayaqua/Encrypt.h index 478ab250..2dd873e9 100644 --- a/src/Mayaqua/Encrypt.h +++ b/src/Mayaqua/Encrypt.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -151,6 +151,7 @@ void RAND_Free_For_SoftEther(); #define HMAC_BLOCK_SIZE 64
// The block size for sha-384 and sha-512 as defined by rfc4868
#define HMAC_BLOCK_SIZE_1024 128
+#define HMAC_BLOCK_SIZE_MAX 512
#define DH_GROUP1_PRIME_768 \
"FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1" \
@@ -505,13 +506,6 @@ void RsaPublicToBin(K *k, void *data); BUF *RsaPublicToBuf(K *k);
K *RsaBinToPublic(void *data, UINT size);
-X_CRL *FileToXCrl(char *filename);
-X_CRL *FileToXCrlW(wchar_t *filename);
-X_CRL *BufToXCrl(BUF *b);
-void FreeXCrl(X_CRL *r);
-bool IsXRevokedByXCrl(X *x, X_CRL *r);
-bool IsXRevoked(X *x);
-
DES_KEY_VALUE *DesNewKeyValue(void *value);
DES_KEY_VALUE *DesRandKeyValue();
void DesFreeKeyValue(DES_KEY_VALUE *v);
@@ -581,11 +575,7 @@ void MdProcess(MD *md, void *dest, void *src, UINT size); void Enc_tls1_PRF(unsigned char *label, int label_len, const unsigned char *sec,
int slen, unsigned char *out1, int olen);
-void HMacSha(UINT sha_type, void *dst, void *key, UINT key_size, void *data, UINT data_size);
void HMacSha1(void *dst, void *key, UINT key_size, void *data, UINT data_size);
-void HMacSha2_256(void *dst, void *key, UINT key_size, void *data, UINT data_size);
-void HMacSha2_384(void *dst, void *key, UINT key_size, void *data, UINT data_size);
-void HMacSha2_512(void *dst, void *key, UINT key_size, void *data, UINT data_size);
void HMacMd5(void *dst, void *key, UINT key_size, void *data, UINT data_size);
BUF *EasyEncrypt(BUF *src_buf);
@@ -601,7 +591,3 @@ void DisableIntelAesAccel(); #endif // ENCRYPT_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/FileIO.c b/src/Mayaqua/FileIO.c index c5d510ad..a2435d5b 100644 --- a/src/Mayaqua/FileIO.c +++ b/src/Mayaqua/FileIO.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -2949,7 +2949,3 @@ IO *FileOpenExW(wchar_t *name, bool write_mode, bool read_lock) }
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/FileIO.h b/src/Mayaqua/FileIO.h index 0ad0bf84..1e6ed227 100644 --- a/src/Mayaqua/FileIO.h +++ b/src/Mayaqua/FileIO.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -388,7 +388,3 @@ bool IsInLinesFile(wchar_t *filename, char *str, bool instr); -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/Internat.c b/src/Mayaqua/Internat.c index fa7bad92..cd8aa854 100644 --- a/src/Mayaqua/Internat.c +++ b/src/Mayaqua/Internat.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -3584,7 +3584,3 @@ UINT UniStrLen(wchar_t *str) return i;
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/Internat.h b/src/Mayaqua/Internat.h index 4f2383e6..480638e7 100644 --- a/src/Mayaqua/Internat.h +++ b/src/Mayaqua/Internat.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -252,7 +252,3 @@ int IconvFreeInternal(void *d); -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/Kernel.c b/src/Mayaqua/Kernel.c index fec7a886..179ab576 100644 --- a/src/Mayaqua/Kernel.c +++ b/src/Mayaqua/Kernel.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -161,6 +161,7 @@ static int ydays[] = };
static UINT current_num_thread = 0;
+static UINT cached_number_of_cpus = 0;
@@ -336,6 +337,43 @@ UINT64 TickGetRealtimeTickValue64() #endif // OS_WIN32
+// Get the number of CPUs
+UINT GetNumberOfCpu()
+{
+ UINT ret = 0;
+
+ if (cached_number_of_cpus == 0)
+ {
+ UINT i = 0;
+
+#ifdef OS_WIN32
+ i = Win32GetNumberOfCpuInner();
+#else // OS_WIN32
+ i = UnixGetNumberOfCpuInner();
+#endif // OS_WIN32
+
+ if (i == 0)
+ {
+ i = 8;
+ }
+
+ cached_number_of_cpus = i;
+ }
+
+ ret = cached_number_of_cpus;
+
+ if (ret == 0)
+ {
+ ret = 1;
+ }
+ if (ret > 128)
+ {
+ ret = 128;
+ }
+
+ return ret;
+}
+
// Creating a thread list
LIST *NewThreadList()
{
@@ -1593,6 +1631,27 @@ void GetDateTimeStrMilli(char *str, UINT size, SYSTEMTIME *st) st->wMilliseconds);
}
+// Get the date and time string in RFC3164 format (example: 2017-09-27T18:25:55.434-9:00)
+void GetDateTimeStrRFC3164(char *str, UINT size, SYSTEMTIME *st, int timezone_min){
+ // Validate arguments
+ if (str == NULL || st == NULL)
+ {
+ return;
+ }
+
+ if(timezone_min == 0){
+ Format(str, size, "%04u-%02u-%02uT%02u:%02u:%02u.%03uZ",
+ st->wYear, st->wMonth, st->wDay,
+ st->wHour, st->wMinute, st->wSecond,
+ st->wMilliseconds);
+ }else{
+ Format(str, size, "%04u-%02u-%02uT%02u:%02u:%02u.%03u%+02d:%02d",
+ st->wYear, st->wMonth, st->wDay,
+ st->wHour, st->wMinute, st->wSecond,
+ st->wMilliseconds, timezone_min/60, timezone_min%60);
+ }
+}
+
// Get the time string
void GetSpanStr(char *str, UINT size, UINT64 sec64)
{
@@ -2274,7 +2333,3 @@ void AbortExitEx(char *msg) #endif // OS_WIN32
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/Kernel.h b/src/Mayaqua/Kernel.h index d30a7bb1..66defefd 100644 --- a/src/Mayaqua/Kernel.h +++ b/src/Mayaqua/Kernel.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -248,6 +248,7 @@ void GetTimeStrEx64(wchar_t *str, UINT size, UINT64 sec64, LOCALE *locale); void GetDateStrEx64(wchar_t *str, UINT size, UINT64 sec64, LOCALE *locale);
void GetTimeStrMilli64(char *str, UINT size, UINT64 sec64);
void GetTimeStr64(char *str, UINT size, UINT64 sec64);
+void GetDateTimeStrRFC3164(char *str, UINT size, SYSTEMTIME *st, int timezone_min);
UINT64 SafeTime64(UINT64 sec64);
bool Run(char *filename, char *arg, bool hide, bool wait);
bool RunW(wchar_t *filename, wchar_t *arg, bool hide, bool wait);
@@ -277,10 +278,7 @@ void MainteThreadList(LIST *o); void FreeThreadList(LIST *o);
void StopThreadList(LIST *o);
void WaitAllThreadsWillBeStopped(LIST *o);
+UINT GetNumberOfCpu();
#endif // KERNEL_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/MayaType.h b/src/Mayaqua/MayaType.h index 13178392..e7ec2f82 100644 --- a/src/Mayaqua/MayaType.h +++ b/src/Mayaqua/MayaType.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -588,7 +588,3 @@ typedef struct IKE_HEADER IKE_HEADER; #endif // MAYATYPE_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/Mayaqua.c b/src/Mayaqua/Mayaqua.c index 220d4f85..90d45862 100644 --- a/src/Mayaqua/Mayaqua.c +++ b/src/Mayaqua/Mayaqua.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1224,7 +1224,3 @@ void PrintDebugInformation() -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/Mayaqua.h b/src/Mayaqua/Mayaqua.h index 17e64950..3cc7674f 100644 --- a/src/Mayaqua/Mayaqua.h +++ b/src/Mayaqua/Mayaqua.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -614,6 +614,7 @@ USHORT CalcChecksum16(void *buf, UINT size); #pragma comment(lib, "version.lib")
#pragma comment(lib, "Netapi32.lib")
#pragma comment(lib, "shlwapi.lib")
+#pragma comment(lib, "crypt32.lib")
#pragma warning( disable : 4099 )
#endif // OS_WIN32
@@ -626,7 +627,3 @@ USHORT CalcChecksum16(void *buf, UINT size); #endif // MAYAQUA_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/Memory.c b/src/Mayaqua/Memory.c index 3f86ef47..1032e1ab 100644 --- a/src/Mayaqua/Memory.c +++ b/src/Mayaqua/Memory.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -4427,7 +4427,3 @@ void XorData(void *dst, void *src1, void *src2, UINT size) c2++;
}
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/Memory.h b/src/Mayaqua/Memory.h index d59eae15..4e239d80 100644 --- a/src/Mayaqua/Memory.h +++ b/src/Mayaqua/Memory.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -479,7 +479,3 @@ void AppendBufStr(BUF *b, char *str); #endif // MEMORY_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/Microsoft.c b/src/Mayaqua/Microsoft.c index 670abbc8..e0134139 100644 --- a/src/Mayaqua/Microsoft.c +++ b/src/Mayaqua/Microsoft.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -15540,7 +15540,3 @@ wchar_t *MsGetWinTempDirW() #endif // WIN32
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/Microsoft.h b/src/Mayaqua/Microsoft.h index d9535d29..29b65a68 100644 --- a/src/Mayaqua/Microsoft.h +++ b/src/Mayaqua/Microsoft.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1217,7 +1217,3 @@ void MsSuspendHandlerThreadProc(THREAD *thread, void *param); #endif // OS_WIN32
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/Network.c b/src/Mayaqua/Network.c index 288a4ceb..f7fddbae 100644 --- a/src/Mayaqua/Network.c +++ b/src/Mayaqua/Network.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -233,7 +233,12 @@ static COUNTER *getip_thread_counter = NULL; static UINT max_getip_thread = 0;
-static char *cipher_list = "RC4-MD5 RC4-SHA AES128-SHA AES256-SHA DES-CBC-SHA DES-CBC3-SHA DHE-RSA-AES128-SHA DHE-RSA-AES256-SHA AES128-GCM-SHA256 AES128-SHA256 AES256-GCM-SHA384 AES256-SHA256 DHE-RSA-AES128-GCM-SHA256 DHE-RSA-AES128-SHA256 DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA256 ECDHE-RSA-AES128-GCM-SHA256 ECDHE-RSA-AES128-SHA256 ECDHE-RSA-AES256-GCM-SHA384 ECDHE-RSA-AES256-SHA384";
+static char *cipher_list = "RC4-MD5 RC4-SHA AES128-SHA AES256-SHA DES-CBC-SHA DES-CBC3-SHA DHE-RSA-AES128-SHA DHE-RSA-AES256-SHA AES128-GCM-SHA256 AES128-SHA256 AES256-GCM-SHA384 AES256-SHA256 DHE-RSA-AES128-GCM-SHA256 DHE-RSA-AES128-SHA256 DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA256 ECDHE-RSA-AES128-GCM-SHA256 ECDHE-RSA-AES128-SHA256 ECDHE-RSA-AES256-GCM-SHA384 ECDHE-RSA-AES256-SHA384"
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ " DHE-RSA-CHACHA20-POLY1305 ECDHE-RSA-CHACHA20-POLY1305";
+#endif
+;
+
static LIST *ip_clients = NULL;
static LIST *local_mac_list = NULL;
@@ -9254,14 +9259,9 @@ void UnixSelectInner(UINT num_read, UINT *reads, UINT num_write, UINT *writes, U if (num != 0)
{
#ifdef UNIX_MACOS
- if (timeout == INFINITE) {
- tv.tv_sec = 0;
- tv.tv_usec = 0;
- } else {
- tv.tv_sec = timeout / 1000;
- tv.tv_usec = (timeout % 1000) * 1000l;
- }
- select(max_fd + 1, &rfds, &wfds, NULL, &tv);
+ tv.tv_sec = timeout / 1000;
+ tv.tv_usec = (timeout % 1000) * 1000l;
+ select(max_fd + 1, &rfds, &wfds, NULL, timeout == INFINITE ? NULL : &tv);
#else // UNIX_MACOS
poll(p, num, timeout == INFINITE ? -1 : (int)timeout);
#endif // UNIX_MACOS
@@ -13017,7 +13017,11 @@ bool StartSSLEx(SOCK *sock, X *x, K *priv, bool client_tls, UINT ssl_timeout, ch {
if (client_tls == false)
{
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ SSL_CTX_set_ssl_version(ssl_ctx, SSLv3_method());
+#else
SSL_CTX_set_ssl_version(ssl_ctx, SSLv23_method());
+#endif
}
else
{
@@ -18323,7 +18327,7 @@ void SetCurrentGlobalIP(IP *ip, bool ipv6) return;
}
- if (IsZeroIp(ip));
+ if (IsZeroIp(ip))
{
return;
}
@@ -22912,7 +22916,3 @@ bool GetSniNameFromSslPacket(UCHAR *packet_buf, UINT packet_size, char *sni, UIN return ret;
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/Network.h b/src/Mayaqua/Network.h index b2f42381..b3734ef5 100644 --- a/src/Mayaqua/Network.h +++ b/src/Mayaqua/Network.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1686,7 +1686,3 @@ UINT64 GetDynValueOrDefaultSafe(char *name, UINT64 default_value); #endif // NETWORK_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/OS.c b/src/Mayaqua/OS.c index aa14936e..48bcf785 100644 --- a/src/Mayaqua/OS.c +++ b/src/Mayaqua/OS.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -555,7 +555,3 @@ void OSFreeEvent(EVENT *event) os->FreeEvent(event);
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/OS.h b/src/Mayaqua/OS.h index 372351c2..8ff91a78 100644 --- a/src/Mayaqua/OS.h +++ b/src/Mayaqua/OS.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -244,7 +244,3 @@ typedef struct OS_DISPATCH_TABLE #endif // OS_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/Object.c b/src/Mayaqua/Object.c index 5838a2ad..2e129250 100644 --- a/src/Mayaqua/Object.c +++ b/src/Mayaqua/Object.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -620,7 +620,3 @@ bool WaitEx(EVENT *e, UINT timeout, volatile bool *cancel) -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/Object.h b/src/Mayaqua/Object.h index fdfbfd35..5c32b1c2 100644 --- a/src/Mayaqua/Object.h +++ b/src/Mayaqua/Object.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -213,7 +213,3 @@ void CheckDeadLockThread(THREAD *t, void *param); #endif // OBJECT_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/Pack.c b/src/Mayaqua/Pack.c index bcc9408c..108d69e5 100644 --- a/src/Mayaqua/Pack.c +++ b/src/Mayaqua/Pack.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1730,7 +1730,3 @@ void PackAddStr(PACK *p, char *name, char *str) }
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/Pack.h b/src/Mayaqua/Pack.h index 378533ec..3ea4c0e1 100644 --- a/src/Mayaqua/Pack.h +++ b/src/Mayaqua/Pack.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -260,7 +260,3 @@ bool PackGetDataEx2(PACK *p, char *name, void *data, UINT size, UINT index); bool PackIsValueExists(PACK *p, char *name);
#endif // PACK_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/Secure.c b/src/Mayaqua/Secure.c index 2df75ca7..afaf10c8 100644 --- a/src/Mayaqua/Secure.c +++ b/src/Mayaqua/Secure.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -549,14 +549,14 @@ bool WriteSecKey(SECURE *sec, bool private_obj, char *name, K *k) RSA_get0_factors(rsa, &p, &q);
RSA_get0_crt_params(rsa, &dmp1, &dmq1, &iqmp);
#else
- rsa->n = n;
- rsa->e = e;
- rsa->d = d;
- rsa->p = p;
- rsa->q = q;
- rsa->dmp1 = dmp1;
- rsa->dmq1 = dmq1;
- rsa->iqmp = iqmp;
+ n = rsa->n;
+ e = rsa->e;
+ d = rsa->d;
+ p = rsa->p;
+ q = rsa->q;
+ dmp1 = rsa->dmp1;
+ dmq1 = rsa->dmq1;
+ iqmp = rsa->iqmp;
#endif
b = BigNumToBuf(n);
@@ -805,11 +805,6 @@ bool WriteSecCert(SECURE *sec, bool private_obj, char *name, X *x) b_private_obj = false;
}
- // CryptoID PKCS#11 requires CKA_ID attiribute instead of CKA_LABEL.
- if(sec->Dev->Id == 22) {
- a[7].type = CKA_ID;
- }
-
// Remove objects which have the same name
if (CheckSecObject(sec, name, SEC_X))
{
@@ -2277,7 +2272,3 @@ void FreeSecure() }
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/Secure.h b/src/Mayaqua/Secure.h index 4cd24b47..43b5ce2d 100644 --- a/src/Mayaqua/Secure.h +++ b/src/Mayaqua/Secure.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -308,8 +308,8 @@ SECURE_DEVICE SupportedList[] = {19, SECURE_IC_CARD, "Gemalto .NET 64bit", "Gemalto", "gtop11dotnet64.dll"},
{20, SECURE_USB_TOKEN, "ePass 2003", "Feitian Technologies", "eps2003csp11.dll"},
{21, SECURE_USB_TOKEN, "ePass 1000ND/2000/3000", "Feitian Technologies", "ngp11v211.dll"},
- {22, SECURE_USB_TOKEN, "CryptoID", "Longmai Technology", "cryptoida_pkcs11.dll"},
- {23, SECURE_USB_TOKEN, "RuToken", "Aktiv Co.", "rtPKCS11.dll"},
+ {22, SECURE_USB_TOKEN, "CryptoID", "Longmai Technology", "cryptoide_pkcs11.dll"},
+ {23, SECURE_USB_TOKEN, "RuToken", "Aktiv Co.", "rtPKCS11.dll"},
};
#ifdef OS_WIN32
@@ -325,7 +325,3 @@ typedef struct SEC_DATA_WIN32 #endif // SECURE_C
#endif // SECURE_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/Str.c b/src/Mayaqua/Str.c index ddc0d55c..5a1b5298 100644 --- a/src/Mayaqua/Str.c +++ b/src/Mayaqua/Str.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -3415,7 +3415,3 @@ UINT StrLen(char *str) }
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/Str.h b/src/Mayaqua/Str.h index ed72ae1b..2ab9693f 100644 --- a/src/Mayaqua/Str.h +++ b/src/Mayaqua/Str.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -252,7 +252,3 @@ void SetStrCaseAccordingToBits(char *str, UINT bits); #endif // STR_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/Table.c b/src/Mayaqua/Table.c index 0b227661..cfdc3074 100644 --- a/src/Mayaqua/Table.c +++ b/src/Mayaqua/Table.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1504,7 +1504,3 @@ bool LoadTableW(wchar_t *filename) }
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/Table.h b/src/Mayaqua/Table.h index 9de294ad..0cd6a592 100644 --- a/src/Mayaqua/Table.h +++ b/src/Mayaqua/Table.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -212,7 +212,3 @@ UINT GetCurrentOsLangId(); -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/TcpIp.c b/src/Mayaqua/TcpIp.c index a66e5a59..990a0ff2 100644 --- a/src/Mayaqua/TcpIp.c +++ b/src/Mayaqua/TcpIp.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -669,6 +669,7 @@ bool AdjustTcpMssL3(UCHAR *src, UINT src_size, UINT mss) if (ip_ver == 4)
{
UINT ip_header_size;
+ UINT ip_total_length;
// IPv4
if (src_size < sizeof(IPV4_HEADER))
{
@@ -709,8 +710,22 @@ bool AdjustTcpMssL3(UCHAR *src, UINT src_size, UINT mss) return false;
}
+ ip_total_length = READ_USHORT(&ip->TotalLength);
+
+ if (ip_total_length < ip_header_size)
+ {
+ // Invalid total length
+ return false;
+ }
+
+ if (src_size < ip_total_length)
+ {
+ // No total length
+ return false;
+ }
+
src += ip_header_size;
- src_size -= ip_header_size;
+ src_size = ip_total_length - ip_header_size;
if (src_size < sizeof(TCP_HEADER))
{
@@ -4310,7 +4325,3 @@ LABEL_CLEANUP: return NULL;
}
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/TcpIp.h b/src/Mayaqua/TcpIp.h index 0c75d3ff..ce5ef7af 100644 --- a/src/Mayaqua/TcpIp.h +++ b/src/Mayaqua/TcpIp.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -944,7 +944,3 @@ bool NormalizeClasslessRouteTableStr(char *dst, UINT dst_size, char *src); #endif // TCPIP_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/Tick64.c b/src/Mayaqua/Tick64.c index 522284de..5275e81e 100644 --- a/src/Mayaqua/Tick64.c +++ b/src/Mayaqua/Tick64.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -403,7 +403,3 @@ void FreeTick64() halt_tick_event = NULL;
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/Tick64.h b/src/Mayaqua/Tick64.h index 647c39f6..07b8cb08 100644 --- a/src/Mayaqua/Tick64.h +++ b/src/Mayaqua/Tick64.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -158,7 +158,3 @@ UINT64 TickHighres64(); -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/Tracking.c b/src/Mayaqua/Tracking.c index 05141be7..fcf9da9d 100644 --- a/src/Mayaqua/Tracking.c +++ b/src/Mayaqua/Tracking.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -999,7 +999,3 @@ void FreeCallStack(CALLSTACK_DATA *s) }
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/Tracking.h b/src/Mayaqua/Tracking.h index e1590c9f..14535c24 100644 --- a/src/Mayaqua/Tracking.h +++ b/src/Mayaqua/Tracking.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -195,7 +195,3 @@ bool IsTrackingEnabled(); #endif // TRACKING_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/TunTap.h b/src/Mayaqua/TunTap.h index ec5b25c1..bb004177 100644 --- a/src/Mayaqua/TunTap.h +++ b/src/Mayaqua/TunTap.h @@ -323,7 +323,3 @@ struct tuninfo { #endif // UNIX_LINUX
#endif // TUNTAP_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/Unix.c b/src/Mayaqua/Unix.c index c9c239ab..2e013832 100644 --- a/src/Mayaqua/Unix.c +++ b/src/Mayaqua/Unix.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1010,6 +1010,63 @@ void UnixRestorePriority() }
}
+UINT UnixGetNumberOfCpuInner()
+{
+ BUF *b;
+ UINT ret = 0;
+
+ b = ReadDump("/proc/cpuinfo");
+ if (b != NULL)
+ {
+ while (true)
+ {
+ char *line = CfgReadNextLine(b);
+
+ if (line == NULL)
+ {
+ break;
+ }
+
+ if (IsEmptyStr(line) == false)
+ {
+ TOKEN_LIST *t = ParseToken(line, ":");
+ if (t != NULL)
+ {
+ if (t->NumTokens >= 2)
+ {
+ char *key = t->Token[0];
+ char *value = t->Token[1];
+
+ Trim(key);
+ Trim(value);
+
+ if (StrCmpi(key, "processor") == 0)
+ {
+ if (IsNum(value))
+ {
+ UINT i = ToInt(value) + 1;
+
+ if (i >= 1 && i <= 128)
+ {
+ ret = MAX(ret, i);
+ }
+ }
+ }
+ }
+
+ FreeToken(t);
+ }
+ }
+
+ Free(line);
+ }
+
+ FreeBuf(b);
+ }
+
+ return ret;
+}
+
// Get the product ID
char *UnixGetProductId()
{
@@ -2859,7 +2916,3 @@ void UnixServiceMain(int argc, char *argv[], char *name, SERVICE_FUNCTION *start }
#endif // UNIX
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/Unix.h b/src/Mayaqua/Unix.h index 2ed91e32..43adf75e 100644 --- a/src/Mayaqua/Unix.h +++ b/src/Mayaqua/Unix.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -204,6 +204,7 @@ char *UnixGetProductId(); void UnixSetHighPriority();
void UnixSetHighOomScore();
void UnixRestorePriority();
+UINT UnixGetNumberOfCpuInner();
void *UnixNewSingleInstance(char *instance_name);
void UnixFreeSingleInstance(void *data);
void UnixGetMemInfo(MEMINFO *info);
@@ -267,7 +268,3 @@ bool UnixIsInVm(); #endif // OS_UNIX
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/Win32.c b/src/Mayaqua/Win32.c index 6f6d221b..2faf0e54 100644 --- a/src/Mayaqua/Win32.c +++ b/src/Mayaqua/Win32.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -983,6 +983,24 @@ void Win32DebugAlert(char *msg) MessageBox(NULL, msg, "Debug", MB_SETFOREGROUND | MB_TOPMOST | MB_SERVICE_NOTIFICATION | MB_OK | MB_ICONEXCLAMATION);
}
+// Get the number of CPUs
+UINT Win32GetNumberOfCpuInner()
+{
+ UINT ret = 0;
+ SYSTEM_INFO info;
+
+ Zero(&info, sizeof(info));
+
+ GetSystemInfo(&info);
+
+ if (info.dwNumberOfProcessors >= 1 && info.dwNumberOfProcessors <= 128)
+ {
+ ret = info.dwNumberOfProcessors;
+ }
+
+ return ret;
+}
+
// Get the OS information
void Win32GetOsInfo(OS_INFO *info)
{
@@ -3522,7 +3540,3 @@ void Win32PrintToFileW(wchar_t *str) #endif // WIN32
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Mayaqua/Win32.h b/src/Mayaqua/Win32.h index 8eabcf86..7e0c7fa4 100644 --- a/src/Mayaqua/Win32.h +++ b/src/Mayaqua/Win32.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -220,6 +220,8 @@ void Win32PrintW(wchar_t *str); void Win32PrintToFileW(wchar_t *str);
bool Win32GetVersionExInternal(void *info);
bool Win32GetVersionExInternalForWindows81orLater(void *info);
+UINT Win32GetNumberOfCpuInner();
+
void Win32SetThreadName(UINT thread_id, char *name);
@@ -228,7 +230,3 @@ void Win32SetThreadName(UINT thread_id, char *name); #endif // OS_WIN32
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Neo/NDIS5.c b/src/Neo/NDIS5.c index f80ab39b..4f061550 100644 --- a/src/Neo/NDIS5.c +++ b/src/Neo/NDIS5.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1737,7 +1737,3 @@ void NeoFree(void *p) }
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Neo/NDIS5.h b/src/Neo/NDIS5.h index fd8ba686..7fe38e31 100644 --- a/src/Neo/NDIS5.h +++ b/src/Neo/NDIS5.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -293,7 +293,3 @@ BOOL NeoNdisOnClose(IRP *irp, IO_STACK_LOCATION *stack); #endif // NDIS5_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Neo/Neo.c b/src/Neo/Neo.c index 9b524af6..eef1d075 100644 --- a/src/Neo/Neo.c +++ b/src/Neo/Neo.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -466,7 +466,3 @@ void NeoFreeStatus(NEO_STATUS *s) NeoZero(s, sizeof(NEO_STATUS));
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Neo/Neo.h b/src/Neo/Neo.h index 1fc0b0d7..f11b496d 100644 --- a/src/Neo/Neo.h +++ b/src/Neo/Neo.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -336,7 +336,3 @@ void NeoReset(NEO_EVENT *event); -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Neo/resource.h b/src/Neo/resource.h index d15b499d..e42cd7d0 100644 --- a/src/Neo/resource.h +++ b/src/Neo/resource.h @@ -108,7 +108,3 @@ #define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Neo6/NDIS6.c b/src/Neo6/NDIS6.c index a76c9f6c..7e7dd59a 100644 --- a/src/Neo6/NDIS6.c +++ b/src/Neo6/NDIS6.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1942,7 +1942,3 @@ void NeoFree(void *p) }
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Neo6/NDIS6.h b/src/Neo6/NDIS6.h index 49dd88e3..c844cc35 100644 --- a/src/Neo6/NDIS6.h +++ b/src/Neo6/NDIS6.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -265,7 +265,3 @@ void NeoNdisCancelOidRequest(NDIS_HANDLE MiniportAdapterContext, PVOID RequestId #endif // NDIS5_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Neo6/Neo6.c b/src/Neo6/Neo6.c index d29a968c..9479d84d 100644 --- a/src/Neo6/Neo6.c +++ b/src/Neo6/Neo6.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -536,7 +536,3 @@ void NeoFreeStatus(NEO_STATUS *s) NeoZero(s, sizeof(NEO_STATUS));
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Neo6/Neo6.h b/src/Neo6/Neo6.h index 665119f2..e8c60e97 100644 --- a/src/Neo6/Neo6.h +++ b/src/Neo6/Neo6.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -345,7 +345,3 @@ void NeoReset(NEO_EVENT *event); -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Neo6/resource.h b/src/Neo6/resource.h index d15b499d..e42cd7d0 100644 --- a/src/Neo6/resource.h +++ b/src/Neo6/resource.h @@ -108,7 +108,3 @@ #define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/README.TXT b/src/README.TXT index d67899e7..5d125446 100644 --- a/src/README.TXT +++ b/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-2016 SoftEther Project at University of Tsukuba, Japan.
+Copyright (c) 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
@@ -123,24 +123,9 @@ on all the following open-source repositories: - GitHub
https://github.com/SoftEtherVPN/SoftEtherVPN/
- - SourceForge
- https://sourceforge.net/p/softethervpn/code/ci/master/tree/
-
- - Google Code
- https://code.google.com/p/softether/source/browse/
-
-
To fetch the source code from GitHub:
$ git clone https://github.com/SoftEtherVPN/SoftEtherVPN.git
-To fetch the source code from SourceForge:
-$ git clone http://git.code.sf.net/p/softethervpn/code
- - or -
-$ git clone git://git.code.sf.net/p/softethervpn/code
-
-To fetch the source code from Google Code:
-$ git clone https://code.google.com/p/softether/
-
We hope that you can reach one of the above URLs at least!
@@ -218,10 +203,3 @@ SOME SOFTWARE PROGRAMS FROM THIRD PARTIES ARE INCLUDED ON THIS SOFTWARE WITH LICENSE CONDITIONS WHICH ARE DESCRIBED ON THE 'THIRD_PARTY.TXT' FILE.
-ADVERTISEMENT
--------------
-
-SoftEther VPN is developed by SoftEther VPN Project at University of Tsukuba.
-Department of Computer Science has dozens of overly-enthusiastic geeks.
-Join us: http://www.tsukuba.ac.jp/english/admission/
-
diff --git a/src/SEVPN.sln b/src/SEVPN.sln index abe7784a..733a75ba 100644 --- a/src/SEVPN.sln +++ b/src/SEVPN.sln @@ -313,14 +313,13 @@ Global {CF2B20BF-9799-40EF-A987-9E4C25E68E1C}.Debug|Win32.ActiveCfg = Release|Win32
{CF2B20BF-9799-40EF-A987-9E4C25E68E1C}.Debug|Win32.Build.0 = Release|Win32
{CF2B20BF-9799-40EF-A987-9E4C25E68E1C}.Debug|x64.ActiveCfg = Release|x64
- {CF2B20BF-9799-40EF-A987-9E4C25E68E1C}.Debug|x64.Build.0 = Release|x64
{CF2B20BF-9799-40EF-A987-9E4C25E68E1C}.Release|Win32.ActiveCfg = Release|Win32
{CF2B20BF-9799-40EF-A987-9E4C25E68E1C}.Release|Win32.Build.0 = Release|Win32
{CF2B20BF-9799-40EF-A987-9E4C25E68E1C}.Release|x64.ActiveCfg = Release|x64
{CF2B20BF-9799-40EF-A987-9E4C25E68E1C}.Release|x64.Build.0 = Release|x64
{F2C40D5C-1C86-43D8-B3FE-8E8F8B488432}.Debug|Win32.ActiveCfg = Debug|Win32
{F2C40D5C-1C86-43D8-B3FE-8E8F8B488432}.Debug|Win32.Build.0 = Debug|Win32
- {F2C40D5C-1C86-43D8-B3FE-8E8F8B488432}.Debug|x64.ActiveCfg = Debug|Win32
+ {F2C40D5C-1C86-43D8-B3FE-8E8F8B488432}.Debug|x64.ActiveCfg = Release|Win32
{F2C40D5C-1C86-43D8-B3FE-8E8F8B488432}.Release|Win32.ActiveCfg = Release|Win32
{F2C40D5C-1C86-43D8-B3FE-8E8F8B488432}.Release|Win32.Build.0 = Release|Win32
{F2C40D5C-1C86-43D8-B3FE-8E8F8B488432}.Release|x64.ActiveCfg = Release|Win32
diff --git a/src/SeLow/SeLow.c b/src/SeLow/SeLow.c index 383bff4e..0ec3b092 100644 --- a/src/SeLow/SeLow.c +++ b/src/SeLow/SeLow.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -2215,7 +2215,3 @@ void SlSleep(int milliSeconds) -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/SeLow/SeLow.h b/src/SeLow/SeLow.h index b773a045..564a55ba 100644 --- a/src/SeLow/SeLow.h +++ b/src/SeLow/SeLow.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -384,7 +384,3 @@ void SlSleep(int milliSeconds); #endif // SELOW_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/SeLow/SeLowCommon.h b/src/SeLow/SeLowCommon.h index 49f1c39c..52e459be 100644 --- a/src/SeLow/SeLowCommon.h +++ b/src/SeLow/SeLowCommon.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -201,7 +201,3 @@ typedef struct SL_ADAPTER_INFO_LIST #define SL_LEFT_FLAG(buf) SL_SIZE_OF_PACKET(buf, SL_MAX_PACKET_EXCHANGE)
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/SeLow/resource.h b/src/SeLow/resource.h index d15b499d..e42cd7d0 100644 --- a/src/SeLow/resource.h +++ b/src/SeLow/resource.h @@ -108,7 +108,3 @@ #define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/See/resource.h b/src/See/resource.h index 22f26322..d61f39b6 100644 --- a/src/See/resource.h +++ b/src/See/resource.h @@ -108,7 +108,3 @@ #define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/See/resource1.h b/src/See/resource1.h index 539d8e14..53038446 100644 --- a/src/See/resource1.h +++ b/src/See/resource1.h @@ -108,7 +108,3 @@ #define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/SeeDll/resource.h b/src/SeeDll/resource.h index c1ce9d46..1c3b7c3b 100644 --- a/src/SeeDll/resource.h +++ b/src/SeeDll/resource.h @@ -108,7 +108,3 @@ #define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/VGate/VGate.c b/src/VGate/VGate.c index ea3ad7e9..527fb69e 100644 --- a/src/VGate/VGate.c +++ b/src/VGate/VGate.c @@ -133,7 +133,3 @@ void FreePluginDll(struct VGATE_FUNCTIONS *funcs) -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/VGate/VGate.h b/src/VGate/VGate.h index 7f698466..bc94c1e3 100644 --- a/src/VGate/VGate.h +++ b/src/VGate/VGate.h @@ -113,7 +113,3 @@ -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/VGate/VGate.vcproj b/src/VGate/VGate.vcproj index 6210a3b4..84559099 100644 --- a/src/VGate/VGate.vcproj +++ b/src/VGate/VGate.vcproj @@ -252,7 +252,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PCDDLL_EXPORTS"
StringPooling="false"
ExceptionHandling="0"
- RuntimeLibrary="0"
+ RuntimeLibrary="1"
StructMemberAlignment="4"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="false"
@@ -351,7 +351,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PCDDLL_EXPORTS;CPU_64"
StringPooling="false"
ExceptionHandling="0"
- RuntimeLibrary="0"
+ RuntimeLibrary="1"
StructMemberAlignment="4"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="false"
diff --git a/src/VGate/resource.h b/src/VGate/resource.h index e29c05ac..84fc265c 100644 --- a/src/VGate/resource.h +++ b/src/VGate/resource.h @@ -108,7 +108,3 @@ #define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Wfp/Wfp.c b/src/Wfp/Wfp.c index 78f43fd3..3d29c796 100644 --- a/src/Wfp/Wfp.c +++ b/src/Wfp/Wfp.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1347,7 +1347,3 @@ void Crush(UINT a, UINT b, UINT c, UINT d) {
KeBugCheckEx(0x00000061, (ULONG_PTR)a, (ULONG_PTR)b, (ULONG_PTR)c, (ULONG_PTR)d);
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Wfp/Wfp.h b/src/Wfp/Wfp.h index db51c097..bf23babe 100644 --- a/src/Wfp/Wfp.h +++ b/src/Wfp/Wfp.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -150,7 +150,3 @@ typedef struct WFP_LOCAL_IP #endif // WFP_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Wfp/WfpInner.h b/src/Wfp/WfpInner.h index 6ea5ae81..30675b02 100644 --- a/src/Wfp/WfpInner.h +++ b/src/Wfp/WfpInner.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -339,7 +339,3 @@ void Crush(); #endif // WFPINNER_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/Wfp/resource1.h b/src/Wfp/resource1.h index 635bf52f..5a5a9cc9 100644 --- a/src/Wfp/resource1.h +++ b/src/Wfp/resource1.h @@ -108,7 +108,3 @@ #define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/bin/hamcore/authors.txt b/src/bin/hamcore/authors.txt index 8a1f2561..44fdbcfd 100644 --- a/src/bin/hamcore/authors.txt +++ b/src/bin/hamcore/authors.txt @@ -6,7 +6,7 @@ AUTHORS OF SOFTETHER VPN CORE DEVELOPERS:
- - Daiyuu Nobori
+ - Daiyuu Nobori, Ph.D.
Computer Science, Graduate School of University of Tsukuba
SoftEther Corporation
E-mail: daiyuu-nobori [at] softether.org
@@ -18,16 +18,16 @@ CORE DEVELOPERS: Risk Engineering, Graduate School of University of Tsukuba
SoftEther Corporation
- - Takao Ito
+ - Takao Ito, Ph.D.
Computer Science, Graduate School of University of Tsukuba
SoftEther Corporation
+ - Mei Sharie Ann Yamaguchi, Ph.D.
+ Life and Environmental Sciences, Graduate School of University of Tsukuba
+
- Christopher Smith
College of Information Science, University of Tsukuba
- - Mei Sharie Ann Yamaguchi
- Life and Environmental Sciences, Graduate School of University of Tsukuba
-
WEB-SITE DESIGNER:
@@ -118,6 +118,26 @@ CONTRIBUTORS on GitHub: - Sacha Bernstein
https://github.com/sacha
+ - cm0x4D
+ https://github.com/cm0x4D
+
+ - DDGo
+ https://github.com/DDGo
+
+ - Noah O'Donoghue
+ https://github.com/NoahO
+
+ - Moataz Elmasry
+ https://github.com/moatazelmasry2
+
+ - Zulyandri Zardi
+ https://github.com/zulzardi
+
+ - rel22
+ https://github.com/rel22
+
+ - Guanzhong Chen
+ https://github.com/quantum5
JOIN THE SOFTETHER VPN DEVELOPMENT
----------------------------------
@@ -127,8 +147,3 @@ Want to become a contributor? Please send us a patch. See also: SoftEther VPN Patch Acceptance Policy
http://www.softether.org/5-download/src/9.patch
-
-Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-Department of Computer Science has dozens of overly-enthusiastic geeks.
-Join us: http://www.tsukuba.ac.jp/english/admission/
-
diff --git a/src/bin/hamcore/eula.txt b/src/bin/hamcore/eula.txt index b9d60973..8070f492 100644 --- a/src/bin/hamcore/eula.txt +++ b/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-2016 Daiyuu Nobori.
-Copyright (c) 2012-2016 SoftEther Project at University of Tsukuba, Japan.
-Copyright (c) 2012-2016 SoftEther Corporation.
+Copyright (c) Daiyuu Nobori.
+Copyright (c) SoftEther Project at University of Tsukuba, Japan.
+Copyright (c) SoftEther Corporation.
All Rights Reserved.
http://www.softether.org/
diff --git a/src/bin/hamcore/openvpn_sample.ovpn b/src/bin/hamcore/openvpn_sample.ovpn index 0ae75863..83bc3df3 100644 --- a/src/bin/hamcore/openvpn_sample.ovpn +++ b/src/bin/hamcore/openvpn_sample.ovpn @@ -1,137 +1,137 @@ -###############################################################################
-# OpenVPN 2.0 Sample Configuration File
-# for PacketiX VPN / SoftEther VPN Server
-#
-# !!! AUTO-GENERATED BY SOFTETHER VPN SERVER MANAGEMENT TOOL !!!
-#
-# !!! YOU HAVE TO REVIEW IT BEFORE USE AND MODIFY IT AS NECESSARY !!!
-#
-# This configuration file is auto-generated. You might use this config file
-# in order to connect to the PacketiX VPN / SoftEther VPN Server.
-# However, before you try it, you should review the descriptions of the file
-# to determine the necessity to modify to suitable for your real environment.
-# If necessary, you have to modify a little adequately on the file.
-# For example, the IP address or the hostname as a destination VPN Server
-# should be confirmed.
-#
-# Note that to use OpenVPN 2.0, you have to put the certification file of
-# the destination VPN Server on the OpenVPN Client computer when you use this
-# config file. Please refer the below descriptions carefully.
-
-
-###############################################################################
-# Specify the type of the layer of the VPN connection.
-#
-# To connect to the VPN Server as a "Remote-Access VPN Client PC",
-# specify 'dev tun'. (Layer-3 IP Routing Mode)
-#
-# To connect to the VPN Server as a bridging equipment of "Site-to-Site VPN",
-# specify 'dev tap'. (Layer-2 Ethernet Bridgine Mode)
-
-dev $TAG_TUN_TAP$
-
-
-###############################################################################
-# Specify the underlying protocol beyond the Internet.
-# Note that this setting must be correspond with the listening setting on
-# the VPN Server.
-#
-# Specify either 'proto tcp' or 'proto udp'.
-
-proto $TAG_PROTO$
-
-
-###############################################################################
-# The destination hostname / IP address, and port number of
-# the target VPN Server.
-#
-# You have to specify as 'remote <HOSTNAME> <PORT>'. You can also
-# specify the IP address instead of the hostname.
-#
-# Note that the auto-generated below hostname are a "auto-detected
-# IP address" of the VPN Server. You have to confirm the correctness
-# beforehand.
-#
-# When you want to connect to the VPN Server by using TCP protocol,
-# the port number of the destination TCP port should be same as one of
-# the available TCP listeners on the VPN Server.
-#
-# When you use UDP protocol, the port number must same as the configuration
-# setting of "OpenVPN Server Compatible Function" on the VPN Server.
-
-$TAG_BEFORE_REMOTE$remote $TAG_HOSTNAME$ $TAG_PORT$
-
-
-###############################################################################
-# The HTTP/HTTPS proxy setting.
-#
-# Only if you have to use the Internet via a proxy, uncomment the below
-# two lines and specify the proxy address and the port number.
-# In the case of using proxy-authentication, refer the OpenVPN manual.
-
-;http-proxy-retry
-;http-proxy [proxy server] [proxy port]
-
-
-###############################################################################
-# The encryption and authentication algorithm.
-#
-# Default setting is good. Modify it as you prefer.
-# When you specify an unsupported algorithm, the error will occur.
-#
-# The supported algorithms are as follows:
-# cipher: [NULL-CIPHER] NULL AES-128-CBC AES-192-CBC AES-256-CBC BF-CBC
-# CAST-CBC CAST5-CBC DES-CBC DES-EDE-CBC DES-EDE3-CBC DESX-CBC
-# RC2-40-CBC RC2-64-CBC RC2-CBC CAMELLIA-128-CBC CAMELLIA-192-CBC CAMELLIA-256-CBC
-# auth: SHA SHA1 SHA256 SHA384 SHA512 MD5 MD4 RMD160
-
-cipher AES-128-CBC
-auth SHA1
-
-
-###############################################################################
-# Other parameters necessary to connect to the VPN Server.
-#
-# It is not recommended to modify it unless you have a particular need.
-
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-client
-verb 3
-auth-user-pass
-
-
-###############################################################################
-# The certificate file of the destination VPN Server.
-#
-# The CA certificate file is embedded in the inline format.
-# You can replace this CA contents if necessary.
-# Please note that if the server certificate is not a self-signed, you have to
-# specify the signer's root certificate (CA) here.
-
-<ca>
-$CA$
-</ca>
-
-
-###############################################################################
-# The client certificate file (dummy).
-#
-# In some implementations of OpenVPN Client software
-# (for example: OpenVPN Client for iOS),
-# a pair of client certificate and private key must be included on the
-# configuration file due to the limitation of the client.
-# So this sample configuration file has a dummy pair of client certificate
-# and private key as follows.
-
-<cert>
-$CERT$
-</cert>
-
-<key>
-$KEY$
-</key>
-
-
+############################################################################### +# OpenVPN 2.0 Sample Configuration File +# for PacketiX VPN / SoftEther VPN Server +# +# !!! AUTO-GENERATED BY SOFTETHER VPN SERVER MANAGEMENT TOOL !!! +# +# !!! YOU HAVE TO REVIEW IT BEFORE USE AND MODIFY IT AS NECESSARY !!! +# +# This configuration file is auto-generated. You might use this config file +# in order to connect to the PacketiX VPN / SoftEther VPN Server. +# However, before you try it, you should review the descriptions of the file +# to determine the necessity to modify to suitable for your real environment. +# If necessary, you have to modify a little adequately on the file. +# For example, the IP address or the hostname as a destination VPN Server +# should be confirmed. +# +# Note that to use OpenVPN 2.0, you have to put the certification file of +# the destination VPN Server on the OpenVPN Client computer when you use this +# config file. Please refer the below descriptions carefully. + + +############################################################################### +# Specify the type of the layer of the VPN connection. +# +# To connect to the VPN Server as a "Remote-Access VPN Client PC", +# specify 'dev tun'. (Layer-3 IP Routing Mode) +# +# To connect to the VPN Server as a bridging equipment of "Site-to-Site VPN", +# specify 'dev tap'. (Layer-2 Ethernet Bridgine Mode) + +dev $TAG_TUN_TAP$ + + +############################################################################### +# Specify the underlying protocol beyond the Internet. +# Note that this setting must be correspond with the listening setting on +# the VPN Server. +# +# Specify either 'proto tcp' or 'proto udp'. + +proto $TAG_PROTO$ + + +############################################################################### +# The destination hostname / IP address, and port number of +# the target VPN Server. +# +# You have to specify as 'remote <HOSTNAME> <PORT>'. You can also +# specify the IP address instead of the hostname. +# +# Note that the auto-generated below hostname are a "auto-detected +# IP address" of the VPN Server. You have to confirm the correctness +# beforehand. +# +# When you want to connect to the VPN Server by using TCP protocol, +# the port number of the destination TCP port should be same as one of +# the available TCP listeners on the VPN Server. +# +# When you use UDP protocol, the port number must same as the configuration +# setting of "OpenVPN Server Compatible Function" on the VPN Server. + +$TAG_BEFORE_REMOTE$remote $TAG_HOSTNAME$ $TAG_PORT$ + + +############################################################################### +# The HTTP/HTTPS proxy setting. +# +# Only if you have to use the Internet via a proxy, uncomment the below +# two lines and specify the proxy address and the port number. +# In the case of using proxy-authentication, refer the OpenVPN manual. + +;http-proxy-retry +;http-proxy [proxy server] [proxy port] + + +############################################################################### +# The encryption and authentication algorithm. +# +# Default setting is good. Modify it as you prefer. +# When you specify an unsupported algorithm, the error will occur. +# +# The supported algorithms are as follows: +# cipher: [NULL-CIPHER] NULL AES-128-CBC AES-192-CBC AES-256-CBC BF-CBC +# CAST-CBC CAST5-CBC DES-CBC DES-EDE-CBC DES-EDE3-CBC DESX-CBC +# RC2-40-CBC RC2-64-CBC RC2-CBC CAMELLIA-128-CBC CAMELLIA-192-CBC CAMELLIA-256-CBC +# auth: SHA SHA1 SHA256 SHA384 SHA512 MD5 MD4 RMD160 + +cipher AES-128-CBC +auth SHA1 + + +############################################################################### +# Other parameters necessary to connect to the VPN Server. +# +# It is not recommended to modify it unless you have a particular need. + +resolv-retry infinite +nobind +persist-key +persist-tun +client +verb 3 +auth-user-pass + + +############################################################################### +# The certificate file of the destination VPN Server. +# +# The CA certificate file is embedded in the inline format. +# You can replace this CA contents if necessary. +# Please note that if the server certificate is not a self-signed, you have to +# specify the signer's root certificate (CA) here. + +<ca> +$CA$ +</ca> + + +############################################################################### +# The client certificate file (dummy). +# +# In some implementations of OpenVPN Client software +# (for example: OpenVPN Client for iOS), +# a pair of client certificate and private key must be included on the +# configuration file due to the limitation of the client. +# So this sample configuration file has a dummy pair of client certificate +# and private key as follows. + +<cert> +$CERT$ +</cert> + +<key> +$KEY$ +</key> + + diff --git a/src/bin/hamcore/strtable_cn.stb b/src/bin/hamcore/strtable_cn.stb index eb036a75..7d86c2f7 100644 --- a/src/bin/hamcore/strtable_cn.stb +++ b/src/bin/hamcore/strtable_cn.stb @@ -1654,7 +1654,7 @@ SM_DDNS_OK_MSG2 动态 DNS 主机名被更改为'%S'。\r\n\r\n单击提示读 SM_DDNS_KEY_TITLE 动态 DNS 密钥
SM_DDNS_KEY_MSG 动态 DNS 密钥: %s\r\n\r\n此密钥与当前的 DDNS 名称相关联。如果你的 VPN 服务器电脑损坏，丢失了密钥，当前的 DDNS 名称将被永远占用，且其他 VPN 服务器将无法使用相同的名称。\r\n如果你想继续使用相同的名称，请在互联网服务上、或另一台电脑上、或在便笺纸上保留密钥。\r\n当在新的 VPN 服务器设置密钥时，编辑 VPN 服务器的配置文件。请在 "declare DDnsClient" 指令下，用跟随 "byte Key" 的值替换字符串的密钥。\r\n请不要同时在两个或多个 VPN 服务器上设置相同的密钥。
SM_DDNS_KEY_ERR 无法读取 DNS 密钥。
-SM_IPSEC_PSK_TOO_LONG 预共享密钥(PSK)有 10 个或更多的字母。\r\n\r\n据报道谷歌安卓的几个版本有一个 10 个或更多字母作为预共享密钥的严重故障。\r\n因此 9 个或少于 9 个字母被推荐作为预共享密钥。\r\n\r\n您要修改预共享密钥吗？
+SM_IPSEC_PSK_TOO_LONG 预共享密钥(PSK)有 10 个或更多的字母。\r\n\r\n据报道谷歌安卓的几个版本有一个 10 个或更多字母作为预共享密钥的严重故障。\r\n因此 9 个或少于 9 个字母被推荐作为预共享密钥。\r\n\r\n您要尝试其他预共享密钥吗？
SM_ADVANCED_REDIRECT_URL_HINT_TITLE 如何使用高级 HTTP 重定向功能
SM_ADVANCED_REDIRECT_URL_HINT 高级 HTTP 重定向(为专家)\r\n\r\n此字符串“<INFO>”是一个占位符。它可以嵌入重定向的 URL 中。\r\n\r\n嵌入 URL 示例：\r\nhttp://www.google.com/search?q=<INFO>|secret\r\n\r\n当客户端将被重定向，重定向的实际 URL 目的地将被取代如下。\r\n\r\n用户名|会话ID|IP 地址|日期和时间|哈希值\r\n\r\n替换后示例：zurukko|SID-ZURUKKO-123|219.117.219.154|20131117100354|99707160AFE7A454042B2C47B064112D652452D7\r\n\r\n各字段的详情描述如下。\r\n\r\n用户名：当前 VPN 会话的用户名将被放置。\r\n\r\n会话ID：VPN 会话的会话 ID 将被放置\r\n\r\n日期和时间：14 位数字将以'YYYYMMDDHHMMSS’格式放置(时区是 UTC)\r\n\r\n哈希值：代表 20 个字节二进制数据的一个 40 字符的十六进制字符串。二进制数据是 SHA-1 哈希函数至临时字符串的结果。在重定向 URL 中“|”符号后，临时字符串是上述字段的位阵列加上秘密字符串的结合。(在上面的例子中，“秘密”是秘密字符串)。如果在 URL 中没有“|”符号，没有哈希值将被添加。\r\n\r\n哈希值的目的：秘密字符串如密钥般有效。感谢密钥。在重定向 URL 中接收重定向查询字符串的 CGI 程序，可以验证包含在 URL 中参数的完整性。\r\n
SM_ADVANCED_REDIRECT_URL_MSG URL 必须以“http://”或“https://”开始
@@ -2448,7 +2448,7 @@ STATIC7 保持互联网连接功能(&K) PREFIX D_ABOUT
S_INFO1 SoftEther VPN %u.0 (Ver %u.%02u, Build %u)
-S_INFO2 An Open-Source VPN Software for Academic Purpose, under the GPLv2 License.\r\nCopyright (c) 2012-%u SoftEther Project at University of Tsukuba, Japan. All Rights Reserved.\r\nWeb Site: http://www.softether.org/\r\n%S
+S_INFO2 Open-Source VPN Software for Academic Purpose, under the GPLv2 License.\r\nCopyright (c) 2012-%u SoftEther Project at University of Tsukuba, Japan. All Rights Reserved.\r\nWeb Site: http://www.softether.org/\r\n%S
S_INFO3 This product includes the following software components:\r\nBitVisor: Copyright (c) 2007, 2008 University of Tsukuba. Copyright (C) 2007, 2008 National Institute of Information and Communications Technology. All rights reserved. / Microsoft(R) C Runtime Library: (c) 2007 Microsoft Corporation. All Rights Reserved. / PKCS #11 Cryptographic Token Interface (Cryptoki): Copyright (c) RSA Security Inc. / WinPcap: Copyright (c) 2001 - 2003 NetGroup, Politecnico di Torino (Italy). All rights reserved. / libedit: Copyright (c) 1992, 1993 The Regents of the University of California. All rights reserved. / libiconv: Copyright (C) 2007 Free Software Foundation, Inc. / ncurses: Copyright (c) 1998-2005, 2006 Free Software Foundation, Inc. / OpenSSL: Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved. This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/). This product includes cryptographic software written by Eric Young (eay@cryptsoft.com). / zlib: (C) 1995-2004 Jean-loup Gailly and Mark Adler. / Special Thanks to: Software Laboratory, Academic Computing Communication Center, Industrial Liaison and Cooperative Research Center and Professor Yasushi Shinjo in University of Tsukuba, Japan.
S_INFO4 此 VPN 服务器作为的一个学术研究且由 (http://www.softether.org/) 为公众利益免费发布的。本软件是日本筑波大学 SoftEther 项目下开发的免费软件，无任何担保。开发人员、版权所有者或分销商在任何情况下对于使用本软件的任何索赔、损害赔偿或其他情况不承担责任。\r\n\r\nSoftEther VPN 是日本政府的研究和开发项目的一项工作，由日本的经济、贸易和工业部资助，由信息化推进机构管理。
IDCANCEL 确定(&O)
diff --git a/src/bin/hamcore/strtable_en.stb b/src/bin/hamcore/strtable_en.stb index b2ecc47d..16e6b08f 100644 --- a/src/bin/hamcore/strtable_en.stb +++ b/src/bin/hamcore/strtable_en.stb @@ -1636,7 +1636,7 @@ SM_DDNS_OK_MSG2 The Dynamic DNS hostname has been changed to '%S'.\r\n\r\nClic SM_DDNS_KEY_TITLE Dynamic DNS Key
SM_DDNS_KEY_MSG Your Dynamic DNS Private Key: %s\r\n\r\nThis is the private key which is associated with your current DDNS name. If your VPN Server PC damaged and lost the key, the current DDNS name will be occupied forever and other VPN Server will not be able to use the same name.\r\nIf you want to continue to use the same name, keep the key on a safe place, such as an Internet storage, an another PC or a notepad.\r\nWhen applying the key to the new VPN Server, edit the configuration file of the VPN Server to replace the key by the string in the value following to "byte Key" in the "declare DDnsClient" directive.\r\nDo not use the duplicated key to two or more VPN Servers at the same time.
SM_DDNS_KEY_ERR Failed to read the DNS key.
-SM_IPSEC_PSK_TOO_LONG The pre-shared key (PSK) has 10 or more letters.\r\n\r\nIt is reported that several versions of Google Android has a serious bug with 10 or more letters pre-shared key.\r\nTherefore 9 or less letters are recommended for pre-shared key.\r\n\r\nDo you want to modify the pre-shared key?
+SM_IPSEC_PSK_TOO_LONG The pre-shared key (PSK) has 10 or more letters.\r\n\r\nIt is reported that several versions of Google Android has a serious bug with 10 or more letters pre-shared key.\r\nTherefore 9 or less letters are recommended for pre-shared key.\r\n\r\nDo you want to try another pre-shared key?
SM_ADVANCED_REDIRECT_URL_HINT_TITLE How to Use Advanced HTTP Redirection Function
SM_ADVANCED_REDIRECT_URL_HINT Advanced HTTP Redirection (For Experts)\r\n\r\nThe string "<INFO>" is a place holder. It can embedded on the URL of redirection.\r\n\r\nEmbedded URL Example:\r\nhttp://www.google.com/search?q=<INFO>|secret\r\n\r\nWhen the client is being redirected, the actual destination URL of redirection will be replaced as follows.\r\n\r\nUsername|Session ID|IP Address|Date and Time|Hash Value\r\n\r\\nAfter Replacement Example: zurukko|SID-ZURUKKO-123|219.117.219.154|20131117100354|99707160AFE7A454042B2C47B064112D652452D7\r\n\r\nThe details of each fields are described as following.\r\n\r\nUsername: The username using for the current VPN Session will be placed.\r\n\r\nSession ID: The Session ID of the VPN Session will be placed.\r\n\r\nDate and Time: 14-digits will be placed as 'YYYYMMDDHHMMSS' format (Time zone is UTC).\r\n\r\nHash Value: A 40-characters hexadecimal strings which represent 20 bytes binary data. The binary data is the result of SHA-1 hash function to the temporary string. The temporary string is the combination of the bit-array of the above fields plus the secret string after the '|' symbol in the redirection URL. (In the above example, "secret" is the secret string.) If there are no '|' symbols in the URL, no hash value will be appended.\r\n\r\nThe Purpose of Hash Value: The secret string is effective as the secret key. Thanks to the secret key, the CGI program which receives the query strings on the redirected URL can verify the integrity of the parameters included in the URL.\r\n
SM_ADVANCED_REDIRECT_URL_MSG An URL must start with "http://" or "https://"
@@ -2428,7 +2428,7 @@ STATIC7 &Keep Alive Internet Connection Function: PREFIX D_ABOUT
S_INFO1 SoftEther VPN %u.0 (Ver %u.%02u, Build %u)
-S_INFO2 An Open-Source VPN Software for Academic Purpose, under the GPLv2 License.\r\nCopyright (c) 2012-%u SoftEther Project at University of Tsukuba, Japan. All Rights Reserved.\r\nWeb Site: http://www.softether.org/\r\n%S
+S_INFO2 Open-Source VPN Software for Academic Purpose, under the GPLv2 License.\r\nCopyright (c) 2012-%u SoftEther Project at University of Tsukuba, Japan. All Rights Reserved.\r\nWeb Site: http://www.softether.org/\r\n%S
S_INFO3 This product includes the following software components:\r\nBitVisor: Copyright (c) 2007, 2008 University of Tsukuba. Copyright (C) 2007, 2008 National Institute of Information and Communications Technology. All rights reserved. / Microsoft(R) C Runtime Library: (c) 2007 Microsoft Corporation. All Rights Reserved. / PKCS #11 Cryptographic Token Interface (Cryptoki): Copyright (c) RSA Security Inc. / WinPcap: Copyright (c) 2001 - 2003 NetGroup, Politecnico di Torino (Italy). All rights reserved. / libedit: Copyright (c) 1992, 1993 The Regents of the University of California. All rights reserved. / libiconv: Copyright (C) 2007 Free Software Foundation, Inc. / ncurses: Copyright (c) 1998-2005, 2006 Free Software Foundation, Inc. / OpenSSL: Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved. This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/). This product includes cryptographic software written by Eric Young (eay@cryptsoft.com). / zlib: (C) 1995-2004 Jean-loup Gailly and Mark Adler. / Special Thanks to: Software Laboratory, Academic Computing Communication Center, Industrial Liaison and Cooperative Research Center and Professor Yasushi Shinjo in University of Tsukuba, Japan.
S_INFO4 THIS SOFTWARE IS FREEWARE DEVELOPED UNDER THE SOFTETHER VPN PROJECT AT UNIVERSITY OF TSUKUBA, WITHOUT WARRANTY OF AND KIND. IN NO EVENT SHALL THE DEVELOPERS, COPYRIGHT OWNERS OR DISTRIBUTORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY IN ANY WAY OUT OF THE USE OF THIS SOFTWARE.\r\n\r\nSoftEther VPN is a work of the research and development project of Japanese Government, subsidized by Ministry of Economy, Trade and Industry of Japan, administrated by Information Promotion Agency.
IDCANCEL &OK
diff --git a/src/bin/hamcore/strtable_ja.stb b/src/bin/hamcore/strtable_ja.stb index d1f4a4dd..720fdb89 100644 --- a/src/bin/hamcore/strtable_ja.stb +++ b/src/bin/hamcore/strtable_ja.stb @@ -2433,7 +2433,7 @@ STATIC7 インターネット接続の維持機能(&N) PREFIX D_ABOUT
S_INFO1 SoftEther VPN %u.0 (Ver %u.%02u, Build %u)
-S_INFO2 An Open-Source VPN Software for Academic Purpose, under the GPLv2 License.\r\nCopyright (c) 2012-%u SoftEther Project at University of Tsukuba, Japan. All Rights Reserved.\r\nWeb Site: http://www.softether.org/\r\n%S
+S_INFO2 Open-Source VPN Software for Academic Purpose, under the GPLv2 License.\r\nCopyright (c) 2012-%u SoftEther Project at University of Tsukuba, Japan. All Rights Reserved.\r\nWeb Site: http://www.softether.org/\r\n%S
S_INFO3 This product includes the following software components:\r\nBitVisor: Copyright (c) 2007, 2008 University of Tsukuba. Copyright (C) 2007, 2008 National Institute of Information and Communications Technology. All rights reserved. / Microsoft(R) C Runtime Library: (c) 2007 Microsoft Corporation. All Rights Reserved. / PKCS #11 Cryptographic Token Interface (Cryptoki): Copyright (c) RSA Security Inc. / WinPcap: Copyright (c) 2001 - 2003 NetGroup, Politecnico di Torino (Italy). All rights reserved. / libedit: Copyright (c) 1992, 1993 The Regents of the University of California. All rights reserved. / libiconv: Copyright (C) 2007 Free Software Foundation, Inc. / ncurses: Copyright (c) 1998-2005, 2006 Free Software Foundation, Inc. / OpenSSL: Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved. This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/). This product includes cryptographic software written by Eric Young (eay@cryptsoft.com). / zlib: (C) 1995-2004 Jean-loup Gailly and Mark Adler. / Special Thanks to: Software Laboratory, Academic Computing Communication Center, Industrial Liaison and Cooperative Research Center and Professor Yasushi Shinjo in University of Tsukuba, Japan.
S_INFO4 本ソフトウェアは筑波大学 SoftEther VPN プロジェクトで開発されたフリーウェアです。本ソフトウェアは一切の保証がない状態で提供されるものであり、開発および配布元は使用の結果の損害について一切責任を負いません。\r\n\r\nSoftEther VPN ソフトウェアは日本国経済産業省のソフトウェア研究開発プロジェクトの成果物です。IPA (独立行政法人 情報処理推進機構) の未踏ソフトウェア創造事業に採択され開発されました。詳しくは http://www.ipa.go.jp/ をご覧ください。
IDCANCEL &OK
diff --git a/src/bin/vpnweb.cab b/src/bin/vpnweb.cab Binary files differindex da59f346..662b2508 100644 --- a/src/bin/vpnweb.cab +++ b/src/bin/vpnweb.cab diff --git a/src/bin/vpnweb.ocx b/src/bin/vpnweb.ocx Binary files differindex 013df20c..b9114dc0 100644 --- a/src/bin/vpnweb.ocx +++ b/src/bin/vpnweb.ocx diff --git a/src/hamcorebuilder/hamcorebuilder.c b/src/hamcorebuilder/hamcorebuilder.c index e9825fa9..07c89bd7 100644 --- a/src/hamcorebuilder/hamcorebuilder.c +++ b/src/hamcorebuilder/hamcorebuilder.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -167,7 +167,3 @@ int main(int argc, char *argv[]) return 0;
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/makefiles/freebsd_32bit.mak b/src/makefiles/freebsd_32bit.mak index e45312a6..ff6e5768 100644 --- a/src/makefiles/freebsd_32bit.mak +++ b/src/makefiles/freebsd_32bit.mak @@ -1,7 +1,7 @@ # SoftEther VPN Source Code # -# Copyright (c) 2012-2016 SoftEther VPN Project at University of Tsukuba, Japan. -# Copyright (c) 2012-2016 Daiyuu Nobori. +# Copyright (c) 2012-2017 SoftEther VPN Project at University of Tsukuba, Japan. +# Copyright (c) 2012-2017 Daiyuu Nobori. # All Rights Reserved. # # http://www.softether.org/ diff --git a/src/makefiles/freebsd_64bit.mak b/src/makefiles/freebsd_64bit.mak index 89fd1e7a..10f06422 100644 --- a/src/makefiles/freebsd_64bit.mak +++ b/src/makefiles/freebsd_64bit.mak @@ -1,7 +1,7 @@ # SoftEther VPN Source Code # -# Copyright (c) 2012-2016 SoftEther VPN Project at University of Tsukuba, Japan. -# Copyright (c) 2012-2016 Daiyuu Nobori. +# Copyright (c) 2012-2017 SoftEther VPN Project at University of Tsukuba, Japan. +# Copyright (c) 2012-2017 Daiyuu Nobori. # All Rights Reserved. # # http://www.softether.org/ diff --git a/src/makefiles/linux_32bit.mak b/src/makefiles/linux_32bit.mak index bf88a0a4..7addd221 100644 --- a/src/makefiles/linux_32bit.mak +++ b/src/makefiles/linux_32bit.mak @@ -1,7 +1,7 @@ # SoftEther VPN Source Code # -# Copyright (c) 2012-2016 SoftEther VPN Project at University of Tsukuba, Japan. -# Copyright (c) 2012-2016 Daiyuu Nobori. +# Copyright (c) 2012-2017 SoftEther VPN Project at University of Tsukuba, Japan. +# Copyright (c) 2012-2017 Daiyuu Nobori. # All Rights Reserved. # # http://www.softether.org/ diff --git a/src/makefiles/linux_64bit.mak b/src/makefiles/linux_64bit.mak index 0fd8c018..c473c1ec 100644 --- a/src/makefiles/linux_64bit.mak +++ b/src/makefiles/linux_64bit.mak @@ -1,7 +1,7 @@ # SoftEther VPN Source Code # -# Copyright (c) 2012-2016 SoftEther VPN Project at University of Tsukuba, Japan. -# Copyright (c) 2012-2016 Daiyuu Nobori. +# Copyright (c) 2012-2017 SoftEther VPN Project at University of Tsukuba, Japan. +# Copyright (c) 2012-2017 Daiyuu Nobori. # All Rights Reserved. # # http://www.softether.org/ diff --git a/src/makefiles/macos_32bit.mak b/src/makefiles/macos_32bit.mak index eb68f931..990f5f3c 100644 --- a/src/makefiles/macos_32bit.mak +++ b/src/makefiles/macos_32bit.mak @@ -1,7 +1,7 @@ # SoftEther VPN Source Code # -# Copyright (c) 2012-2016 SoftEther VPN Project at University of Tsukuba, Japan. -# Copyright (c) 2012-2016 Daiyuu Nobori. +# Copyright (c) 2012-2017 SoftEther VPN Project at University of Tsukuba, Japan. +# Copyright (c) 2012-2017 Daiyuu Nobori. # All Rights Reserved. # # http://www.softether.org/ diff --git a/src/makefiles/macos_64bit.mak b/src/makefiles/macos_64bit.mak index b5a04579..dfffc565 100644 --- a/src/makefiles/macos_64bit.mak +++ b/src/makefiles/macos_64bit.mak @@ -1,7 +1,7 @@ # SoftEther VPN Source Code # -# Copyright (c) 2012-2016 SoftEther VPN Project at University of Tsukuba, Japan. -# Copyright (c) 2012-2016 Daiyuu Nobori. +# Copyright (c) 2012-2017 SoftEther VPN Project at University of Tsukuba, Japan. +# Copyright (c) 2012-2017 Daiyuu Nobori. # All Rights Reserved. # # http://www.softether.org/ diff --git a/src/makefiles/openbsd_32bit.mak b/src/makefiles/openbsd_32bit.mak index dd9781af..5fbfc5a1 100644 --- a/src/makefiles/openbsd_32bit.mak +++ b/src/makefiles/openbsd_32bit.mak @@ -1,7 +1,7 @@ # SoftEther VPN Source Code # -# Copyright (c) 2012-2016 SoftEther VPN Project at University of Tsukuba, Japan. -# Copyright (c) 2012-2016 Daiyuu Nobori. +# Copyright (c) 2012-2017 SoftEther VPN Project at University of Tsukuba, Japan. +# Copyright (c) 2012-2017 Daiyuu Nobori. # All Rights Reserved. # # http://www.softether.org/ diff --git a/src/makefiles/openbsd_64bit.mak b/src/makefiles/openbsd_64bit.mak index 43776fa5..b9795fd5 100644 --- a/src/makefiles/openbsd_64bit.mak +++ b/src/makefiles/openbsd_64bit.mak @@ -1,7 +1,7 @@ # SoftEther VPN Source Code # -# Copyright (c) 2012-2016 SoftEther VPN Project at University of Tsukuba, Japan. -# Copyright (c) 2012-2016 Daiyuu Nobori. +# Copyright (c) 2012-2017 SoftEther VPN Project at University of Tsukuba, Japan. +# Copyright (c) 2012-2017 Daiyuu Nobori. # All Rights Reserved. # # http://www.softether.org/ diff --git a/src/makefiles/solaris_32bit.mak b/src/makefiles/solaris_32bit.mak index 154e115f..7e28b4c2 100644 --- a/src/makefiles/solaris_32bit.mak +++ b/src/makefiles/solaris_32bit.mak @@ -1,7 +1,7 @@ # SoftEther VPN Source Code # -# Copyright (c) 2012-2016 SoftEther VPN Project at University of Tsukuba, Japan. -# Copyright (c) 2012-2016 Daiyuu Nobori. +# Copyright (c) 2012-2017 SoftEther VPN Project at University of Tsukuba, Japan. +# Copyright (c) 2012-2017 Daiyuu Nobori. # All Rights Reserved. # # http://www.softether.org/ diff --git a/src/makefiles/solaris_64bit.mak b/src/makefiles/solaris_64bit.mak index 589b3dd9..572b83d1 100644 --- a/src/makefiles/solaris_64bit.mak +++ b/src/makefiles/solaris_64bit.mak @@ -1,7 +1,7 @@ # SoftEther VPN Source Code # -# Copyright (c) 2012-2016 SoftEther VPN Project at University of Tsukuba, Japan. -# Copyright (c) 2012-2016 Daiyuu Nobori. +# Copyright (c) 2012-2017 SoftEther VPN Project at University of Tsukuba, Japan. +# Copyright (c) 2012-2017 Daiyuu Nobori. # All Rights Reserved. # # http://www.softether.org/ diff --git a/src/vpn16/vpn16.c b/src/vpn16/vpn16.c index 2c0cfb1c..0964bd79 100644 --- a/src/vpn16/vpn16.c +++ b/src/vpn16/vpn16.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -485,7 +485,3 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR CmdLine32, int CmdSho }
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/vpn16/vpn16.h b/src/vpn16/vpn16.h index 4b13a9d7..ca0fe2db 100644 --- a/src/vpn16/vpn16.h +++ b/src/vpn16/vpn16.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -130,7 +130,3 @@ BOOL IsSafeChar(char c); #endif // VPN16_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/vpnbrand/vpnbrand.h b/src/vpnbrand/vpnbrand.h index 0bacd471..6926ec09 100644 --- a/src/vpnbrand/vpnbrand.h +++ b/src/vpnbrand/vpnbrand.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -137,7 +137,3 @@ int main(int argc, char *argv[]); // BRANDINGKIT_H
#endif
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/vpnbridge/vpnbridge.c b/src/vpnbridge/vpnbridge.c index 345ea922..813c0a66 100644 --- a/src/vpnbridge/vpnbridge.c +++ b/src/vpnbridge/vpnbridge.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -165,7 +165,3 @@ int main(int argc, char *argv[]) }
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/vpnclient/vpncsvc.c b/src/vpnclient/vpncsvc.c index f2cf30a6..39192734 100644 --- a/src/vpnclient/vpncsvc.c +++ b/src/vpnclient/vpncsvc.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -152,7 +152,3 @@ int main(int argc, char *argv[]) }
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/vpnclient/vpncsvc.h b/src/vpnclient/vpncsvc.h index 4e45d38f..bab3600a 100644 --- a/src/vpnclient/vpncsvc.h +++ b/src/vpnclient/vpncsvc.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -122,7 +122,3 @@ void StopProcess(); #endif // VPNCSVC_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/vpncmd/vpncmd.c b/src/vpncmd/vpncmd.c index 203da53c..044d73f1 100644 --- a/src/vpncmd/vpncmd.c +++ b/src/vpncmd/vpncmd.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -200,7 +200,3 @@ int main(int argc, char *argv[]) }
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/vpncmdsys/vpncmdsys.c b/src/vpncmdsys/vpncmdsys.c index b00edfc0..365fdf1f 100644 --- a/src/vpncmdsys/vpncmdsys.c +++ b/src/vpncmdsys/vpncmdsys.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -298,7 +298,3 @@ int main(int argc, char *argv[]) return ret_code;
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/vpncmdsys/vpncmdsys.h b/src/vpncmdsys/vpncmdsys.h index 54840e40..8c4cbd43 100644 --- a/src/vpncmdsys/vpncmdsys.h +++ b/src/vpncmdsys/vpncmdsys.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -120,7 +120,3 @@ bool IsWindowsNt(); -
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/vpncmgr/vpncmgr.c b/src/vpncmgr/vpncmgr.c index 066eecfa..cff283ba 100644 --- a/src/vpncmgr/vpncmgr.c +++ b/src/vpncmgr/vpncmgr.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -150,7 +150,3 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, char *CmdLine, int CmdShow) }
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/vpndrvinst/vpndrvinst.c b/src/vpndrvinst/vpndrvinst.c index 29c607d0..25ae7099 100644 --- a/src/vpndrvinst/vpndrvinst.c +++ b/src/vpndrvinst/vpndrvinst.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -364,7 +364,3 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, char *CmdLine, int CmdShow) return 0;
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/vpndrvinst/vpndrvinst.h b/src/vpndrvinst/vpndrvinst.h index 3ea8fcbf..ab716dbb 100644 --- a/src/vpndrvinst/vpndrvinst.h +++ b/src/vpndrvinst/vpndrvinst.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -132,7 +132,3 @@ void MainFunction(char *cmd); int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, char *CmdLine, int CmdShow);
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/vpndrvinst/vpndrvinst.vcproj b/src/vpndrvinst/vpndrvinst.vcproj index 3ced1a7c..dbe358a7 100644 --- a/src/vpndrvinst/vpndrvinst.vcproj +++ b/src/vpndrvinst/vpndrvinst.vcproj @@ -82,6 +82,7 @@ GenerateManifest="false"
AdditionalManifestDependencies="type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'"
IgnoreAllDefaultLibraries="false"
+ IgnoreDefaultLibraryNames="LIBCMTD.lib"
DelayLoadDLLs="setupapi.dll;advapi32.dll;user32.dll"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(SolutionDir)DebugFiles\pdb\$(PlatformName)_$(ConfigurationName)\$(ProjectName).pdb"
@@ -183,6 +184,7 @@ GenerateManifest="false"
AdditionalManifestDependencies="type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='amd64' publicKeyToken='6595b64144ccf1df' language='*'"
IgnoreAllDefaultLibraries="false"
+ IgnoreDefaultLibraryNames="LIBCMTD.lib"
DelayLoadDLLs="setupapi.dll;advapi32.dll;user32.dll"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(SolutionDir)DebugFiles\pdb\$(PlatformName)_$(ConfigurationName)\$(ProjectName).pdb"
diff --git a/src/vpninstall/vpninstall.c b/src/vpninstall/vpninstall.c index eb8b26ec..1710cf41 100644 --- a/src/vpninstall/vpninstall.c +++ b/src/vpninstall/vpninstall.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1663,7 +1663,3 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, char *CmdLine, int CmdShow) }
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/vpninstall/vpninstall.h b/src/vpninstall/vpninstall.h index aa804199..9401f6d2 100644 --- a/src/vpninstall/vpninstall.h +++ b/src/vpninstall/vpninstall.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -236,7 +236,3 @@ void ViSetSkip(); #endif // VPNINSTALL_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/vpnserver/vpnserver.c b/src/vpnserver/vpnserver.c index 22b31a61..425de24a 100644 --- a/src/vpnserver/vpnserver.c +++ b/src/vpnserver/vpnserver.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -165,7 +165,3 @@ int main(int argc, char *argv[]) #endif // OS_WIN32
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/vpnsetup/vpnsetup.c b/src/vpnsetup/vpnsetup.c index 5d9b356d..6b7aaa9b 100644 --- a/src/vpnsetup/vpnsetup.c +++ b/src/vpnsetup/vpnsetup.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -144,7 +144,3 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, char *CmdLine, int CmdShow) }
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/vpnsmgr/vpnsmgr.c b/src/vpnsmgr/vpnsmgr.c index 8e24593b..20964215 100644 --- a/src/vpnsmgr/vpnsmgr.c +++ b/src/vpnsmgr/vpnsmgr.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -141,7 +141,3 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, char *CmdLine, int CmdShow) }
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/vpnweb/vpnweb.h b/src/vpnweb/vpnweb.h index 0da85893..e23a4a1a 100644 --- a/src/vpnweb/vpnweb.h +++ b/src/vpnweb/vpnweb.h @@ -4,7 +4,7 @@ /* File created by MIDL compiler version 7.00.0500 */
-/* at Sun Nov 27 14:34:13 2016
+/* at Wed Oct 18 16:31:00 2017
*/
/* Compiler settings for .\vpnweb.idl:
Oicf, W1, Zp8, env=Win32 (32b run)
diff --git a/src/vpnweb/vpnweb_i.c b/src/vpnweb/vpnweb_i.c index a1d06c03..84df263d 100644 --- a/src/vpnweb/vpnweb_i.c +++ b/src/vpnweb/vpnweb_i.c @@ -6,7 +6,7 @@ /* File created by MIDL compiler version 7.00.0500 */
-/* at Sun Nov 27 14:34:13 2016
+/* at Wed Oct 18 16:31:00 2017
*/
/* Compiler settings for .\vpnweb.idl:
Oicf, W1, Zp8, env=Win32 (32b run)
diff --git a/src/vpnweb/vpnweb_p.c b/src/vpnweb/vpnweb_p.c index 336068e5..9376da04 100644 --- a/src/vpnweb/vpnweb_p.c +++ b/src/vpnweb/vpnweb_p.c @@ -4,7 +4,7 @@ /* File created by MIDL compiler version 7.00.0500 */
-/* at Sun Nov 27 14:34:13 2016
+/* at Wed Oct 18 16:31:00 2017
*/
/* Compiler settings for .\vpnweb.idl:
Oicf, W1, Zp8, env=Win32 (32b run)
diff --git a/src/vpnweb/vpnwebdlg.c b/src/vpnweb/vpnwebdlg.c index e6079f8a..985fc2d0 100644 --- a/src/vpnweb/vpnwebdlg.c +++ b/src/vpnweb/vpnwebdlg.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1605,7 +1605,3 @@ UINT SendMsg(HWND hWnd, UINT id, UINT msg, WPARAM wParam, LPARAM lParam) return (UINT)SendMessageA(DlgItem(hWnd, id), msg, wParam, lParam);
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/vpnweb/vpnwebdlg.h b/src/vpnweb/vpnwebdlg.h index f3d4eb6f..485805b0 100644 --- a/src/vpnweb/vpnwebdlg.h +++ b/src/vpnweb/vpnwebdlg.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -146,7 +146,3 @@ void GetVpnWebDlgSize(SIZE *size); #endif
#endif // VPNWEBDLG_H
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
diff --git a/src/vpnweb/vpnwebdlg_inner.h b/src/vpnweb/vpnwebdlg_inner.h index 7cb42a4d..ec4b53e7 100644 --- a/src/vpnweb/vpnwebdlg_inner.h +++ b/src/vpnweb/vpnwebdlg_inner.h @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -279,7 +279,3 @@ void SetRange(HWND hWnd, UINT id, UINT start, UINT end); void SetPos(HWND hWnd, UINT id, UINT pos);
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
|