1
0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2025-06-28 11:55:08 +03:00

v4.29-9678-rtm

This commit is contained in:
dnobori 2019-02-28 14:35:30 +09:00
parent eed55f2099
commit 553978c9a5
288 changed files with 1450 additions and 2617 deletions

View File

@ -1,149 +1 @@
SoftEther VPN is developed by SoftEther VPN Project at University of Tsukuba. Please see: https://github.com/SoftEtherVPN/SoftEtherVPN/blob/master/AUTHORS.TXT
http://www.softether.org/
AUTHORS OF SOFTETHER VPN
------------------------
CORE DEVELOPERS:
- Daiyuu Nobori, Ph.D.
Computer Science, Graduate School of University of Tsukuba
SoftEther Corporation
E-mail: daiyuu-nobori [at] softether.org
- Tetsuo Sugiyama, Ph.D.
SoftEther Corporation
- Junpei Kuwana, Ph.D.
Risk Engineering, Graduate School of University of Tsukuba
SoftEther Corporation
- 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
WEB-SITE DESIGNER:
- Genya Hatakeyama
College of Information Science, University of Tsukuba
CONTRIBUTORS on GitHub:
- Melvyn
https://github.com/yaurthek
- nattoheaven
https://github.com/nattoheaven
- ELIN
https://github.com/el1n
- Dmitry Orlov
https://github.com/mosquito
- Renaud Allard
https://github.com/renaudallard
- Hideki Saito
https://github.com/hsaito
- Dexter Ang
https://github.com/thepoch
- YF
https://github.com/yfdyh000
- Sahal Ansari
https://github.com/sahal
- ygrek
https://github.com/ygrek
- ajee cai
https://github.com/ajeecai
- NOKUBI Takatsugu
https://github.com/knok
- Den Lesnov
https://github.com/Leden
- Ilya Shipitsin
https://github.com/chipitsine
- Matt Lewandowsky
https://github.com/lewellyn
- Raymond Tau
https://github.com/rtau
- Luiz Eduardo Gava
https://github.com/LegDog
- Charles Surett
https://github.com/scj643
- Jeff Tang
https://github.com/mrjefftang
- Victor Salgado
https://github.com/mcsalgado
- micsell
https://github.com/micsell
- yehorov
https://github.com/yehorov
- dglushenok
https://github.com/dglushenok
- NoNameA 774
https://github.com/nna774
- Alexandre De Oliveira
https://github.com/yodresh
- Bernhard Rosenkraenzer
https://github.com/berolinux
- 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
----------------------------------
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

View File

@ -177,7 +177,8 @@
Copyright (c) all contributors on SoftEther VPN project in GitHub. Copyright (c) all contributors on SoftEther VPN project in GitHub.
Copyright (c) Daiyuu Nobori, SoftEther Project at University of Tsukuba, and SoftEther Corporation. Copyright (c) Daiyuu Nobori, SoftEther Project at University of Tsukuba,
and SoftEther Corporation.
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -240,4 +241,3 @@ READ AND UNDERSTAND THE 'src/WARNING.TXT' FILE BEFORE USING THIS SOFTWARE.
SOME SOFTWARE PROGRAMS FROM THIRD PARTIES ARE INCLUDED ON THIS SOFTWARE WITH SOME SOFTWARE PROGRAMS FROM THIRD PARTIES ARE INCLUDED ON THIS SOFTWARE WITH
LICENSE CONDITIONS WHICH ARE DESCRIBED ON THE 'src/THIRD_PARTY.TXT' FILE. LICENSE CONDITIONS WHICH ARE DESCRIBED ON THE 'src/THIRD_PARTY.TXT' FILE.

View File

@ -177,7 +177,8 @@
Copyright (c) all contributors on SoftEther VPN project in GitHub. Copyright (c) all contributors on SoftEther VPN project in GitHub.
Copyright (c) Daiyuu Nobori, SoftEther Project at University of Tsukuba, and SoftEther Corporation. Copyright (c) Daiyuu Nobori, SoftEther Project at University of Tsukuba,
and SoftEther Corporation.
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -240,4 +241,3 @@ READ AND UNDERSTAND THE 'src/WARNING.TXT' FILE BEFORE USING THIS SOFTWARE.
SOME SOFTWARE PROGRAMS FROM THIRD PARTIES ARE INCLUDED ON THIS SOFTWARE WITH SOME SOFTWARE PROGRAMS FROM THIRD PARTIES ARE INCLUDED ON THIS SOFTWARE WITH
LICENSE CONDITIONS WHICH ARE DESCRIBED ON THE 'src/THIRD_PARTY.TXT' FILE. LICENSE CONDITIONS WHICH ARE DESCRIBED ON THE 'src/THIRD_PARTY.TXT' FILE.

12
README
View File

@ -16,7 +16,10 @@ https://www.softether-download.com/
We accept your patches by the acceptance policy: We accept your patches by the acceptance policy:
https://www.softether.org/5-download/src/9.patch https://www.softether.org/5-download/src/9.patch
Copyright (c) SoftEther Project at University of Tsukuba, Japan. Copyright (c) all contributors on SoftEther VPN project in GitHub.
Copyright (c) Daiyuu Nobori, SoftEther Project at University of Tsukuba,
and SoftEther Corporation.
All rights reserved.
The development of SoftEther VPN was supported by the MITOH Project, The development of SoftEther VPN was supported by the MITOH Project,
a research and development project by Japanese Government, a research and development project by Japanese Government,
@ -24,9 +27,10 @@ subsidized by METI (Ministry of Economy, Trade and Industry of Japan),
administrated by IPA (Information Promotion Agency, Japan). administrated by IPA (Information Promotion Agency, Japan).
https://www.ipa.go.jp/english/humandev/ https://www.ipa.go.jp/english/humandev/
This program is free software; you can redistribute it and/or modify Licensed under the Apache License, Version 2.0 (the "License");
it under the terms of the GNU General Public License version 2 you may not use this file except in compliance with the License.
as published by the Free Software Foundation. You may obtain a copy of the License at:
http://www.apache.org/licenses/LICENSE-2.0
SoftEther VPN ("SoftEther" means "Software Ethernet") is one of the SoftEther VPN ("SoftEther" means "Software Ethernet") is one of the
world's most powerful and easy-to-use multi-protocol VPN software. world's most powerful and easy-to-use multi-protocol VPN software.

View File

@ -16,7 +16,10 @@ https://www.softether-download.com/
We accept your patches by the acceptance policy: We accept your patches by the acceptance policy:
https://www.softether.org/5-download/src/9.patch https://www.softether.org/5-download/src/9.patch
Copyright (c) SoftEther Project at University of Tsukuba, Japan. Copyright (c) all contributors on SoftEther VPN project in GitHub.
Copyright (c) Daiyuu Nobori, SoftEther Project at University of Tsukuba,
and SoftEther Corporation.
All rights reserved.
The development of SoftEther VPN was supported by the MITOH Project, The development of SoftEther VPN was supported by the MITOH Project,
a research and development project by Japanese Government, a research and development project by Japanese Government,
@ -24,9 +27,10 @@ subsidized by METI (Ministry of Economy, Trade and Industry of Japan),
administrated by IPA (Information Promotion Agency, Japan). administrated by IPA (Information Promotion Agency, Japan).
https://www.ipa.go.jp/english/humandev/ https://www.ipa.go.jp/english/humandev/
This program is free software; you can redistribute it and/or modify Licensed under the Apache License, Version 2.0 (the "License");
it under the terms of the GNU General Public License version 2 you may not use this file except in compliance with the License.
as published by the Free Software Foundation. You may obtain a copy of the License at:
http://www.apache.org/licenses/LICENSE-2.0
SoftEther VPN ("SoftEther" means "Software Ethernet") is one of the SoftEther VPN ("SoftEther" means "Software Ethernet") is one of the
world's most powerful and easy-to-use multi-protocol VPN software. world's most powerful and easy-to-use multi-protocol VPN software.

View File

@ -766,17 +766,7 @@ the PacketiX VPN source-tree without GPLv2 conditions.
The list of contributors for SoftEther VPN Project: The list of contributors for SoftEther VPN Project:
- Melvyn https://github.com/SoftEtherVPN/SoftEtherVPN/blob/master/AUTHORS.TXT
https://github.com/yaurthek
- nattoheaven
https://github.com/nattoheaven
- ELIN
https://github.com/el1n
- YF
https://github.com/yfdyh000
SoftEther Corporation, the distributor of PacketiX VPN, appreciates all SoftEther Corporation, the distributor of PacketiX VPN, appreciates all

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Build Utility // Build Utility
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Build Utility // Build Utility
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Build Utility // Build Utility
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -2,8 +2,6 @@
// //
// Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved. // Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved.
// Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved. // Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved.
// Comments: Tetsuo Sugiyama, Ph.D.
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -2,8 +2,6 @@
// //
// Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved. // Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved.
// Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved. // Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved.
// Comments: Tetsuo Sugiyama, Ph.D.
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -2,8 +2,6 @@
// //
// Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved. // Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved.
// Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved. // Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved.
// Comments: Tetsuo Sugiyama, Ph.D.
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -2,8 +2,6 @@
// //
// Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved. // Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved.
// Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved. // Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved.
// Comments: Tetsuo Sugiyama, Ph.D.
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -2,8 +2,6 @@
// //
// Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved. // Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved.
// Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved. // Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved.
// Comments: Tetsuo Sugiyama, Ph.D.
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -2,8 +2,6 @@
// //
// Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved. // Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved.
// Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved. // Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved.
// Comments: Tetsuo Sugiyama, Ph.D.
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -2,8 +2,6 @@
// //
// Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved. // Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved.
// Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved. // Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved.
// Comments: Tetsuo Sugiyama, Ph.D.
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -2,8 +2,6 @@
// //
// Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved. // Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved.
// Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved. // Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved.
// Comments: Tetsuo Sugiyama, Ph.D.
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -2,8 +2,6 @@
// //
// Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved. // Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved.
// Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved. // Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved.
// Comments: Tetsuo Sugiyama, Ph.D.
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -2,8 +2,6 @@
// //
// Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved. // Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved.
// Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved. // Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved.
// Comments: Tetsuo Sugiyama, Ph.D.
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -2,8 +2,6 @@
// //
// Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved. // Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved.
// Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved. // Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved.
// Comments: Tetsuo Sugiyama, Ph.D.
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -2,8 +2,6 @@
// //
// Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved. // Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved.
// Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved. // Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved.
// Comments: Tetsuo Sugiyama, Ph.D.
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -2,8 +2,6 @@
// //
// Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved. // Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved.
// Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved. // Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved.
// Comments: Tetsuo Sugiyama, Ph.D.
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -2,8 +2,6 @@
// //
// Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved. // Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved.
// Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved. // Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved.
// Comments: Tetsuo Sugiyama, Ph.D.
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -2,8 +2,6 @@
// //
// Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved. // Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved.
// Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved. // Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved.
// Comments: Tetsuo Sugiyama, Ph.D.
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -2,8 +2,6 @@
// //
// Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved. // Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved.
// Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved. // Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved.
// Comments: Tetsuo Sugiyama, Ph.D.
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -2,8 +2,6 @@
// //
// Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved. // Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved.
// Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved. // Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved.
// Comments: Tetsuo Sugiyama, Ph.D.
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -2,8 +2,6 @@
// //
// Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved. // Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved.
// Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved. // Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved.
// Comments: Tetsuo Sugiyama, Ph.D.
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -2,8 +2,6 @@
// //
// Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved. // Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved.
// Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved. // Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved.
// Comments: Tetsuo Sugiyama, Ph.D.
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -2,8 +2,6 @@
// //
// Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved. // Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved.
// Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved. // Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved.
// Comments: Tetsuo Sugiyama, Ph.D.
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -2,8 +2,6 @@
// //
// Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved. // Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved.
// Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved. // Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved.
// Comments: Tetsuo Sugiyama, Ph.D.
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -2,8 +2,6 @@
// //
// Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved. // Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved.
// Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved. // Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved.
// Comments: Tetsuo Sugiyama, Ph.D.
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -2,8 +2,6 @@
// //
// Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved. // Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved.
// Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved. // Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved.
// Comments: Tetsuo Sugiyama, Ph.D.
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -2,8 +2,6 @@
// //
// Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved. // Copyright (C) 2012-2014 Daiyuu Nobori. All Rights Reserved.
// Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved. // Copyright (C) 2012-2014 SoftEther VPN Project at University of Tsukuba. All Rights Reserved.
// Comments: Tetsuo Sugiyama, Ph.D.
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Build Utility // Build Utility
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -7,8 +7,6 @@
// コードが再生成されるときに損失したりします。 // コードが再生成されるときに損失したりします。
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Comments: Tetsuo Sugiyama, Ph.D.
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -7,8 +7,6 @@
// コードが再生成されるときに損失したりします。 // コードが再生成されるときに損失したりします。
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Comments: Tetsuo Sugiyama, Ph.D.
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Build Utility // Build Utility
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Build Utility // Build Utility
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.
@ -609,6 +609,13 @@ namespace BuildUtil
string gccOptionForLink; string gccOptionForLink;
string gccOptionForCompile; string gccOptionForCompile;
bool try_no_pie = false;
if (this.Os == OSList.Linux)
{
try_no_pie = true;
}
generateGccOptions(srcDir, false, false, out gccOptionForLink, out gccOptionForCompile); generateGccOptions(srcDir, false, false, out gccOptionForLink, out gccOptionForCompile);
string codeDir = Path.Combine(srcDir, "code"); string codeDir = Path.Combine(srcDir, "code");
@ -630,7 +637,23 @@ namespace BuildUtil
sr.WriteLine("# Platform: {0}", this.CrossLibName); sr.WriteLine("# Platform: {0}", this.CrossLibName);
sr.WriteLine(); sr.WriteLine();
sr.WriteLine("CC={0}", this.Compiler); sr.WriteLine("CC={0}", this.Compiler);
sr.WriteLine("OPTIONS={0}", gccOptionForLink); sr.WriteLine();
if (try_no_pie)
{
sr.WriteLine("#For Ubuntu 18.04 or later we must add -no-pie option for gcc if supported");
sr.WriteLine("RET_NO_PIE_CHECK := $(shell $(CC) -no-pie 2>&1 | grep no-pie | wc -w)");
sr.WriteLine("ifeq ($(RET_NO_PIE_CHECK),0)");
sr.WriteLine("\tNO_PIE_OPTION=-no-pie");
sr.WriteLine("else");
sr.WriteLine("\tNO_PIE_OPTION=");
sr.WriteLine("endif");
}
else
{
sr.WriteLine("NO_PIE_OPTION=");
}
sr.WriteLine();
sr.WriteLine("OPTIONS=$(NO_PIE_OPTION) {0}", gccOptionForLink);
sr.WriteLine(); sr.WriteLine();
sr.WriteLine("default:"); sr.WriteLine("default:");
sr.WriteLine("\t@./.install.sh"); sr.WriteLine("\t@./.install.sh");
@ -648,53 +671,13 @@ namespace BuildUtil
sr.WriteLine("\t-ranlib lib/{0}", Path.GetFileName(filename)); sr.WriteLine("\t-ranlib lib/{0}", Path.GetFileName(filename));
} }
bool no_pie_first = false;
bool try_no_pie = false;
if (this.Os == OSList.Linux)
{
try_no_pie = true;
if (this.Cpu == CpuList.x86 || this.Cpu == CpuList.x64 || this.Cpu == CpuList.intel)
{
no_pie_first = true;
}
}
sr.WriteLine("\t-ranlib code/{0}.a", this.Software.ToString()); sr.WriteLine("\t-ranlib code/{0}.a", this.Software.ToString());
if (try_no_pie == false)
{
sr.WriteLine("\t$(CC) code/{0}.a $(OPTIONS) -o {0}", this.Software.ToString()); sr.WriteLine("\t$(CC) code/{0}.a $(OPTIONS) -o {0}", this.Software.ToString());
}
else
{
if (no_pie_first == false)
{
sr.WriteLine("\t$(CC) code/{0}.a $(OPTIONS) -o {0} || $(CC) -no-pie code/{0}.a $(OPTIONS) -o {0}", this.Software.ToString());
}
else
{
sr.WriteLine("\t$(CC) -no-pie code/{0}.a $(OPTIONS) -o {0} || $(CC) code/{0}.a $(OPTIONS) -o {0}", this.Software.ToString());
}
}
sr.WriteLine("\t-ranlib code/{0}.a", "vpncmd"); sr.WriteLine("\t-ranlib code/{0}.a", "vpncmd");
if (try_no_pie == false)
{
sr.WriteLine("\t$(CC) code/{0}.a $(OPTIONS) -o {0}", "vpncmd"); sr.WriteLine("\t$(CC) code/{0}.a $(OPTIONS) -o {0}", "vpncmd");
}
else
{
if (no_pie_first == false)
{
sr.WriteLine("\t$(CC) code/{0}.a $(OPTIONS) -o {0} || $(CC) -no-pie code/{0}.a $(OPTIONS) -o {0}", "vpncmd");
}
else
{
sr.WriteLine("\t$(CC) -no-pie code/{0}.a $(OPTIONS) -o {0} || $(CC) code/{0}.a $(OPTIONS) -o {0}", "vpncmd");
}
}
if (this.Software == Software.vpnserver_vpnbridge || this.Software == Software.vpnbridge || this.Software == Software.vpnserver) if (this.Software == Software.vpnserver_vpnbridge || this.Software == Software.vpnbridge || this.Software == Software.vpnserver)
{ {

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Build Utility // Build Utility
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Build Utility // Build Utility
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Build Utility // Build Utility
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -7,8 +7,6 @@
// コードが再生成されるときに損失したりします。 // コードが再生成されるときに損失したりします。
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Comments: Tetsuo Sugiyama, Ph.D.
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -7,8 +7,6 @@
// コードが再生成されるときに損失したりします。 // コードが再生成されるときに損失したりします。
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Comments: Tetsuo Sugiyama, Ph.D.
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Build Utility // Build Utility
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Build Utility // Build Utility
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,21 +1,21 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
// Contributors: // Contributors:
// - ELIN (https://github.com/el1n) // - ELIN (https://github.com/el1n)
// Comments: Tetsuo Sugiyama, Ph.D.
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.
@ -1618,7 +1618,7 @@ UINT StGetHubMsg(ADMIN *a, RPC_MSG *t)
else else
{ {
FreeRpcMsg(t); FreeRpcMsg(t);
Zero(t, sizeof(t)); Zero(t, sizeof(RPC_MSG));
t->Msg = GetHubMsg(h); t->Msg = GetHubMsg(h);
@ -6303,7 +6303,7 @@ UINT StGetLink(ADMIN *a, RPC_CREATE_LINK *t)
StrCpy(hubname, sizeof(hubname), t->HubName); StrCpy(hubname, sizeof(hubname), t->HubName);
FreeRpcCreateLink(t); FreeRpcCreateLink(t);
Zero(t, sizeof(t)); Zero(t, sizeof(RPC_CREATE_LINK));
StrCpy(t->HubName, sizeof(t->HubName), hubname); StrCpy(t->HubName, sizeof(t->HubName), hubname);
Lock(k->lock); Lock(k->lock);
@ -7749,7 +7749,7 @@ UINT StGetHubRadius(ADMIN *a, RPC_RADIUS *t)
return ERR_HUB_NOT_FOUND; return ERR_HUB_NOT_FOUND;
} }
Zero(t, sizeof(t)); Zero(t, sizeof(RPC_RADIUS));
//GetRadiusServer(h, t->RadiusServerName, sizeof(t->RadiusServerName), //GetRadiusServer(h, t->RadiusServerName, sizeof(t->RadiusServerName),
// &t->RadiusPort, t->RadiusSecret, sizeof(t->RadiusSecret)); // &t->RadiusPort, t->RadiusSecret, sizeof(t->RadiusSecret));
GetRadiusServerEx(h, t->RadiusServerName, sizeof(t->RadiusServerName), GetRadiusServerEx(h, t->RadiusServerName, sizeof(t->RadiusServerName),

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.
@ -2698,7 +2698,7 @@ void EthPutPacketLinuxIpRaw(ETH *e, void *data, UINT size)
p = ParsePacket(data, size); p = ParsePacket(data, size);
if (p->BroadcastPacket || Cmp(p->MacAddressDest, e->RawIpMyMacAddr, 6) == 0) if (p != NULL && (p->BroadcastPacket || Cmp(p->MacAddressDest, e->RawIpMyMacAddr, 6) == 0))
{ {
if (IsValidUnicastMacAddress(p->MacAddressSrc)) if (IsValidUnicastMacAddress(p->MacAddressSrc))
{ {
@ -2707,7 +2707,7 @@ void EthPutPacketLinuxIpRaw(ETH *e, void *data, UINT size)
} }
if (IsZero(e->RawIpYourMacAddr, 6) || IsValidUnicastMacAddress(p->MacAddressSrc) == false || if (IsZero(e->RawIpYourMacAddr, 6) || IsValidUnicastMacAddress(p->MacAddressSrc) == false ||
(p->BroadcastPacket == false && Cmp(p->MacAddressDest, e->RawIpMyMacAddr, 6) != 0)) (p != NULL && p->BroadcastPacket == false && Cmp(p->MacAddressDest, e->RawIpMyMacAddr, 6) != 0))
{ {
Free(data); Free(data);
FreePacket(p); FreePacket(p);

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,21 +1,21 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
// Contributors: // Contributors:
// - ELIN (https://github.com/el1n) // - ELIN (https://github.com/el1n)
// Comments: Tetsuo Sugiyama, Ph.D.
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,21 +1,21 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
// Contributors: // Contributors:
// - ELIN (https://github.com/el1n) // - ELIN (https://github.com/el1n)
// Comments: Tetsuo Sugiyama, Ph.D.
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.
@ -135,10 +135,10 @@
// Version number // Version number
#define CEDAR_VER 428 #define CEDAR_VER 429
// Build Number // Build Number
#define CEDAR_BUILD 9669 #define CEDAR_BUILD 9678
// Beta number // Beta number
//#define BETA_NUMBER 3 //#define BETA_NUMBER 3
@ -157,12 +157,12 @@
#endif // BUILD_PLACE #endif // BUILD_PLACE
// Specifies the build date // Specifies the build date
#define BUILD_DATE_Y 2018 #define BUILD_DATE_Y 2019
#define BUILD_DATE_M 9 #define BUILD_DATE_M 2
#define BUILD_DATE_D 11 #define BUILD_DATE_D 28
#define BUILD_DATE_HO 11 #define BUILD_DATE_HO 8
#define BUILD_DATE_MI 48 #define BUILD_DATE_MI 44
#define BUILD_DATE_SE 34 #define BUILD_DATE_SE 58
// Tolerable time difference // Tolerable time difference
#define ALLOW_TIMESTAMP_DIFF (UINT64)(3 * 24 * 60 * 60 * 1000) #define ALLOW_TIMESTAMP_DIFF (UINT64)(3 * 24 * 60 * 60 * 1000)

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,21 +1,21 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
// Contributors: // Contributors:
// - nattoheaven (https://github.com/nattoheaven) // - nattoheaven (https://github.com/nattoheaven)
// Comments: Tetsuo Sugiyama, Ph.D.
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.
@ -8930,14 +8930,7 @@ bool CtSetPassword(CLIENT *c, RPC_CLIENT_PASSWORD *pass)
{ {
return false; return false;
} }
if (pass->Password == NULL)
{
str = "";
}
else
{
str = pass->Password; str = pass->Password;
}
if (StrCmp(str, "********") != 0) if (StrCmp(str, "********") != 0)
{ {
@ -10129,7 +10122,7 @@ char *DecryptPassword(BUF *b)
} }
str = ZeroMalloc(b->Size + 1); str = ZeroMalloc(b->Size + 1);
c = NewCrypt(key, sizeof(key)); c = NewCrypt(key, sizeof(key)); // NOTE by Daiyuu Nobori 2018-09-28: This is not a bug! Do not try to fix it!!
Encrypt(c, str, b->Buf, b->Size); Encrypt(c, str, b->Buf, b->Size);
FreeCrypt(c); FreeCrypt(c);
@ -10175,7 +10168,7 @@ BUF *EncryptPassword(char *password)
size = StrLen(password) + 1; size = StrLen(password) + 1;
tmp = ZeroMalloc(size); tmp = ZeroMalloc(size);
c = NewCrypt(key, sizeof(key)); c = NewCrypt(key, sizeof(key)); // NOTE by Daiyuu Nobori 2018-09-28: This is not a bug! Do not try to fix it!!
Encrypt(c, tmp, password, size - 1); Encrypt(c, tmp, password, size - 1);
FreeCrypt(c); FreeCrypt(c);

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.
@ -711,6 +711,14 @@ bool CheckMemory()
} }
Free(pp); Free(pp);
// OpenSSL Check
if (RsaCheckEx() == false)
{
// Abort
Print("RsaCheck(): OpenSSL Library Init Failed. (too old?)\nPlease install the latest version of OpenSSL.\n\n");
ok = false;
}
return ok; return ok;
} }
@ -19395,20 +19403,8 @@ UINT PsDhcpDisable(CONSOLE *c, char *cmd_name, wchar_t *str, void *param)
} }
else else
{ {
bool ok = true;
t.UseDhcp = false; t.UseDhcp = false;
if (ok == false)
{
// Parameter is invalid
ret = ERR_INVALID_PARAMETER;
CmdPrintError(c, ret);
FreeParamValueList(o);
return ret;
}
else
{
ret = ScSetSecureNATOption(ps->Rpc, &t); ret = ScSetSecureNATOption(ps->Rpc, &t);
if (ret != ERR_NO_ERROR) if (ret != ERR_NO_ERROR)
@ -19419,7 +19415,6 @@ UINT PsDhcpDisable(CONSOLE *c, char *cmd_name, wchar_t *str, void *param)
return ret; return ret;
} }
} }
}
FreeParamValueList(o); FreeParamValueList(o);

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.
@ -1082,12 +1082,12 @@ void ConnectionSend(CONNECTION *c, UINT64 now)
for (i = 0;i < num;i++) for (i = 0;i < num;i++)
{ {
TCPSOCK *tcpsock = tcpsocks[i]; TCPSOCK *tcpsock = tcpsocks[i];
if (tcpsock->Sock->Connected && tcpsock->Sock->AsyncMode && if (s != NULL && tcpsock->Sock->Connected && tcpsock->Sock->AsyncMode &&
IS_SEND_TCP_SOCK(tcpsock)) IS_SEND_TCP_SOCK(tcpsock))
{ {
// Processing of KeepAlive // Processing of KeepAlive
if (now >= tcpsock->NextKeepAliveTime || tcpsock->NextKeepAliveTime == 0 || if (now >= tcpsock->NextKeepAliveTime || tcpsock->NextKeepAliveTime == 0 ||
(s != NULL && s->UseUdpAcceleration && s->UdpAccel != NULL && s->UdpAccel->MyPortByNatTServerChanged)) (s->UseUdpAcceleration && s->UdpAccel != NULL && s->UdpAccel->MyPortByNatTServerChanged))
{ {
// Send the KeepAlive // Send the KeepAlive
SendKeepAlive(c, tcpsock); SendKeepAlive(c, tcpsock);
@ -1181,7 +1181,7 @@ void ConnectionSend(CONNECTION *c, UINT64 now)
UINT j; UINT j;
QUEUE *q; QUEUE *q;
if (s->UdpAccel != NULL) if (s != NULL && s->UdpAccel != NULL)
{ {
UdpAccelSetTick(s->UdpAccel, now); UdpAccelSetTick(s->UdpAccel, now);
} }
@ -1589,7 +1589,7 @@ SEND_START:
{ {
// Packet data array // Packet data array
void **datas = MallocFast(sizeof(void *) * num_packet); void **datas = MallocFast(sizeof(void *) * num_packet);
UINT *sizes = MallocFast(sizeof(UINT *) * num_packet); UINT *sizes = MallocFast(sizeof(UINT) * num_packet);
UINT i; UINT i;
i = 0; i = 0;

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.
@ -276,16 +276,18 @@ UINT EcConnect(char *host, UINT port, char *password, RPC **rpc)
// RPC server function // RPC server function
PACK *ElRpcServer(RPC *r, char *name, PACK *p) PACK *ElRpcServer(RPC *r, char *name, PACK *p)
{ {
EL *e = (EL *)r->Param; EL *e;
PACK *ret; PACK *ret;
UINT err; UINT err;
bool ok; bool ok;
// Validate arguments // Validate arguments
if (r == NULL || name == NULL || p == NULL || e == NULL) if (r == NULL || name == NULL || p == NULL || r->Param == NULL)
{ {
return NULL; return NULL;
} }
e = (EL *)r->Param;
ret = NewPack(); ret = NewPack();
err = ERR_NO_ERROR; err = ERR_NO_ERROR;
ok = false; ok = false;

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.
@ -3700,7 +3700,7 @@ bool HubPaPutPacket(SESSION *s, void *data, UINT size)
pa->Now = Tick64(); pa->Now = Tick64();
// Processing of Adjust TCP MSS // Processing of Adjust TCP MSS
if (hub->Option != NULL && hub->Option->DisableAdjustTcpMss == false && s != NULL) if (hub != NULL && hub->Option != NULL && hub->Option->DisableAdjustTcpMss == false && s != NULL)
{ {
UINT target_mss = (hub->Option->AdjustTcpMssValue == 0 ? INFINITE : hub->Option->AdjustTcpMssValue); UINT target_mss = (hub->Option->AdjustTcpMssValue == 0 ? INFINITE : hub->Option->AdjustTcpMssValue);
UINT session_mss = (s->AdjustMss == 0 ? INFINITE : s->AdjustMss); UINT session_mss = (s->AdjustMss == 0 ? INFINITE : s->AdjustMss);
@ -3779,7 +3779,7 @@ bool HubPaPutPacket(SESSION *s, void *data, UINT size)
CancelList(s->CancelList); CancelList(s->CancelList);
// Yield // Yield
if (hub->Option != NULL && hub->Option->YieldAfterStorePacket) if (hub != NULL && hub->Option != NULL && hub->Option->YieldAfterStorePacket)
{ {
YieldCpu(); YieldCpu();
} }
@ -3844,7 +3844,7 @@ LABEL_TRY_AGAIN:
if (no_parse_dhcp == false && packet != NULL) if (no_parse_dhcp == false && packet != NULL)
{ {
if (hub->Option != NULL && hub->Option->RemoveDefGwOnDhcpForLocalhost) if (hub != NULL && hub->Option != NULL && hub->Option->RemoveDefGwOnDhcpForLocalhost)
{ {
// Remove the designation of the DHCP server from the DHCP response packet addressed to localhost // Remove the designation of the DHCP server from the DHCP response packet addressed to localhost
if (packet->TypeL7 == L7_DHCPV4) if (packet->TypeL7 == L7_DHCPV4)
@ -5361,6 +5361,7 @@ void DeleteOldIpTableEntry(LIST *o)
if (e->UpdatedTime <= oldest_time) if (e->UpdatedTime <= oldest_time)
{ {
old = e; old = e;
oldest_time = e->UpdatedTime;
} }
} }
@ -5476,7 +5477,7 @@ void StorePacketToHubPa(HUB_PA *dest, SESSION *src, void *data, UINT size, PKT *
} }
} }
if (src != NULL && src->Hub != NULL && src->Hub->Option != NULL && src->Hub->Option->FixForDLinkBPDU) if (packet != NULL && src != NULL && src->Hub != NULL && src->Hub->Option != NULL && src->Hub->Option->FixForDLinkBPDU)
{ {
// Measures for D-Link bug // Measures for D-Link bug
UCHAR *mac = packet->MacAddressSrc; UCHAR *mac = packet->MacAddressSrc;
@ -5621,7 +5622,7 @@ bool StorePacketFilterByPolicy(SESSION *s, PKT *p)
hub = s->Hub; hub = s->Hub;
if (hub->Option != NULL) if (hub != NULL && hub->Option != NULL)
{ {
no_heavy = hub->Option->DoNotSaveHeavySecurityLogs; no_heavy = hub->Option->DoNotSaveHeavySecurityLogs;
} }
@ -6098,7 +6099,7 @@ void IntoTrafficLimiter(TRAFFIC_LIMITER *tr, PKT *p)
} }
// Value increase // Value increase
tr->Value += (UINT64)(p->PacketSize * 8); tr->Value += (UINT64)p->PacketSize * (UINT64)8;
} }
// The bandwidth reduction by traffic limiter // The bandwidth reduction by traffic limiter

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.
@ -2792,7 +2792,7 @@ IPSECSA *NewIPsecSa(IKE_SERVER *ike, IKE_CLIENT *c, IKE_SA *ike_sa, bool initiat
// Set the expiration time // Set the expiration time
if (setting->LifeSeconds != 0) if (setting->LifeSeconds != 0)
{ {
UINT64 span = (UINT64)(setting->LifeSeconds * 1000) + (UINT64)IKE_SOFT_EXPIRES_MARGIN; UINT64 span = (UINT64)((UINT64)setting->LifeSeconds * (UINT64)1000) + (UINT64)IKE_SOFT_EXPIRES_MARGIN;
sa->ExpiresHardTick = ike->Now + span; sa->ExpiresHardTick = ike->Now + span;
sa->ExpiresSoftTick = ike->Now + span; sa->ExpiresSoftTick = ike->Now + span;
//sa->ExpiresSoftTick = ike->Now + (UINT64)5000; //sa->ExpiresSoftTick = ike->Now + (UINT64)5000;
@ -3842,6 +3842,10 @@ bool IkeIsVendorIdExists(IKE_PACKET *p, char *str)
for (i = 0;i < num;i++) for (i = 0;i < num;i++)
{ {
IKE_PACKET_PAYLOAD *payload = IkeGetPayload(p->PayloadList, IKE_PAYLOAD_VENDOR_ID, i); IKE_PACKET_PAYLOAD *payload = IkeGetPayload(p->PayloadList, IKE_PAYLOAD_VENDOR_ID, i);
if (payload == NULL)
{
break;
}
if (CompareBuf(payload->Payload.VendorId.Data, buf)) if (CompareBuf(payload->Payload.VendorId.Data, buf))
{ {

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.
@ -775,7 +775,7 @@ bool PPPParseUsername(CEDAR *cedar, char *src_username, ETHERIP_ID *dst)
char src[MAX_SIZE]; char src[MAX_SIZE];
// Validate arguments // Validate arguments
Zero(dst, sizeof(ETHERIP_ID)); Zero(dst, sizeof(ETHERIP_ID));
if (cedar == NULL || src == NULL || dst == NULL) if (cedar == NULL || dst == NULL)
{ {
return false; return false;
} }
@ -1318,7 +1318,7 @@ PPP_PACKET *PPPProcessRequestPacket(PPP_SESSION *p, PPP_PACKET *req)
t = 1; t = 1;
} }
p->DhcpRenewInterval = (UINT64)(t * 1000); p->DhcpRenewInterval = (UINT64)t * (UINT64)1000;
p->DhcpNextRenewTime = Tick64() + p->DhcpRenewInterval; p->DhcpNextRenewTime = Tick64() + p->DhcpRenewInterval;
if (true) if (true)
@ -2143,10 +2143,6 @@ PPP_PACKET *ParsePPPPacket(void *data, UINT size)
buf = (UCHAR *)data; buf = (UCHAR *)data;
// Address // Address
if (size < 1)
{
goto LABEL_ERROR;
}
if (buf[0] != 0xff) if (buf[0] != 0xff)
{ {
goto LABEL_ERROR; goto LABEL_ERROR;

View File

@ -1,19 +1,19 @@
// SoftEther VPN Source Code - Stable Edition Repository // SoftEther VPN Source Code - Stable Edition Repository
// Cedar Communication Module // Cedar Communication Module
// //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2. // SoftEther VPN Server, Client and Bridge are free software under the Apache License, Version 2.0.
// //
// Copyright (c) Daiyuu Nobori. // Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation. // Copyright (c) SoftEther Corporation.
Copyright (c) all contributors on SoftEther VPN project in GitHub.
// //
// All Rights Reserved. // All Rights Reserved.
// //
// http://www.softether.org/ // http://www.softether.org/
// //
// Author: Daiyuu Nobori, Ph.D. // This stable branch is officially managed by Daiyuu Nobori, the owner of SoftEther VPN Project.
// Comments: Tetsuo Sugiyama, Ph.D. // Pull requests should be sent to the Developer Edition Master Repository on https://github.com/SoftEtherVPN/SoftEtherVPN
//
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU General Public License
// version 2 as published by the Free Software Foundation. // version 2 as published by the Free Software Foundation.

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