From 553978c9a505c2fa427dba7633e69c8f147e9223 Mon Sep 17 00:00:00 2001 From: dnobori Date: Thu, 28 Feb 2019 14:35:30 +0900 Subject: v4.29-9678-rtm --- src/Cedar/Account.c | 8 ++++---- src/Cedar/Account.h | 8 ++++---- src/Cedar/Admin.c | 14 +++++++------- src/Cedar/Admin.h | 8 ++++---- src/Cedar/AzureClient.c | 8 ++++---- src/Cedar/AzureClient.h | 8 ++++---- src/Cedar/AzureServer.c | 8 ++++---- src/Cedar/AzureServer.h | 8 ++++---- src/Cedar/Bridge.c | 8 ++++---- src/Cedar/Bridge.h | 8 ++++---- src/Cedar/BridgeUnix.c | 12 ++++++------ src/Cedar/BridgeUnix.h | 8 ++++---- src/Cedar/BridgeWin32.c | 8 ++++---- src/Cedar/BridgeWin32.h | 8 ++++---- src/Cedar/CM.c | 8 ++++---- src/Cedar/CM.h | 8 ++++---- src/Cedar/CMInner.h | 8 ++++---- src/Cedar/Cedar.c | 8 ++++---- src/Cedar/Cedar.h | 24 ++++++++++++------------ src/Cedar/CedarPch.c | 8 ++++---- src/Cedar/CedarPch.h | 8 ++++---- src/Cedar/CedarType.h | 8 ++++---- src/Cedar/Client.c | 21 +++++++-------------- src/Cedar/Client.h | 8 ++++---- src/Cedar/Command.c | 37 ++++++++++++++++--------------------- src/Cedar/Command.h | 8 ++++---- src/Cedar/Connection.c | 16 ++++++++-------- src/Cedar/Connection.h | 8 ++++---- src/Cedar/Console.c | 8 ++++---- src/Cedar/Console.h | 8 ++++---- src/Cedar/DDNS.c | 8 ++++---- src/Cedar/DDNS.h | 8 ++++---- src/Cedar/Database.c | 8 ++++---- src/Cedar/Database.h | 8 ++++---- src/Cedar/EM.c | 8 ++++---- src/Cedar/EM.h | 8 ++++---- src/Cedar/EMInner.h | 8 ++++---- src/Cedar/EtherLog.c | 14 ++++++++------ src/Cedar/EtherLog.h | 8 ++++---- src/Cedar/Hub.c | 21 +++++++++++---------- src/Cedar/Hub.h | 8 ++++---- src/Cedar/IPsec.c | 8 ++++---- src/Cedar/IPsec.h | 8 ++++---- src/Cedar/IPsec_EtherIP.c | 8 ++++---- src/Cedar/IPsec_EtherIP.h | 8 ++++---- src/Cedar/IPsec_IKE.c | 14 +++++++++----- src/Cedar/IPsec_IKE.h | 8 ++++---- src/Cedar/IPsec_IPC.c | 8 ++++---- src/Cedar/IPsec_IPC.h | 8 ++++---- src/Cedar/IPsec_IkePacket.c | 8 ++++---- src/Cedar/IPsec_IkePacket.h | 8 ++++---- src/Cedar/IPsec_L2TP.c | 8 ++++---- src/Cedar/IPsec_L2TP.h | 8 ++++---- src/Cedar/IPsec_PPP.c | 16 ++++++---------- src/Cedar/IPsec_PPP.h | 8 ++++---- src/Cedar/IPsec_Win7.c | 8 ++++---- src/Cedar/IPsec_Win7.h | 8 ++++---- src/Cedar/IPsec_Win7Inner.h | 8 ++++---- src/Cedar/Interop_OpenVPN.c | 8 ++++---- src/Cedar/Interop_OpenVPN.h | 8 ++++---- src/Cedar/Interop_SSTP.c | 8 ++++---- src/Cedar/Interop_SSTP.h | 8 ++++---- src/Cedar/Layer3.c | 8 ++++---- src/Cedar/Layer3.h | 8 ++++---- src/Cedar/Link.c | 8 ++++---- src/Cedar/Link.h | 8 ++++---- src/Cedar/Listener.c | 8 ++++---- src/Cedar/Listener.h | 8 ++++---- src/Cedar/Logging.c | 19 ++++++------------- src/Cedar/Logging.h | 8 ++++---- src/Cedar/NM.c | 8 ++++---- src/Cedar/NM.h | 8 ++++---- src/Cedar/NMInner.h | 8 ++++---- src/Cedar/Nat.c | 12 +++++++----- src/Cedar/Nat.h | 8 ++++---- src/Cedar/NativeStack.c | 8 ++++---- src/Cedar/NativeStack.h | 8 ++++---- src/Cedar/NullLan.c | 8 ++++---- src/Cedar/NullLan.h | 8 ++++---- src/Cedar/Protocol.c | 15 ++++----------- src/Cedar/Protocol.h | 8 ++++---- src/Cedar/Radius.c | 8 ++++---- src/Cedar/Radius.h | 8 ++++---- src/Cedar/Remote.c | 8 ++++---- src/Cedar/Remote.h | 8 ++++---- src/Cedar/SM.c | 8 ++++---- src/Cedar/SM.h | 8 ++++---- src/Cedar/SMInner.h | 8 ++++---- src/Cedar/SW.c | 8 ++++---- src/Cedar/SW.h | 8 ++++---- src/Cedar/SWInner.h | 8 ++++---- src/Cedar/Sam.c | 8 ++++---- src/Cedar/Sam.h | 8 ++++---- src/Cedar/SeLowUser.c | 8 ++++---- src/Cedar/SeLowUser.h | 8 ++++---- src/Cedar/SecureInfo.c | 8 ++++---- src/Cedar/SecureInfo.h | 8 ++++---- src/Cedar/SecureNAT.c | 8 ++++---- src/Cedar/SecureNAT.h | 8 ++++---- src/Cedar/Server.c | 33 ++++++++++++--------------------- src/Cedar/Server.h | 8 ++++---- src/Cedar/Session.c | 12 ++++++------ src/Cedar/Session.h | 8 ++++---- src/Cedar/UT.c | 8 ++++---- src/Cedar/UT.h | 8 ++++---- src/Cedar/UdpAccel.c | 8 ++++---- src/Cedar/UdpAccel.h | 8 ++++---- src/Cedar/VG.c | 8 ++++---- src/Cedar/VG.h | 8 ++++---- src/Cedar/VLan.c | 8 ++++---- src/Cedar/VLan.h | 8 ++++---- src/Cedar/VLanUnix.c | 8 ++++---- src/Cedar/VLanUnix.h | 8 ++++---- src/Cedar/VLanWin32.c | 8 ++++---- src/Cedar/VLanWin32.h | 8 ++++---- src/Cedar/Virtual.c | 12 ++++++------ src/Cedar/Virtual.h | 8 ++++---- src/Cedar/WaterMark.c | 8 ++++---- src/Cedar/WaterMark.h | 8 ++++---- src/Cedar/WebUI.c | 9 ++++----- src/Cedar/WebUI.h | 5 ++--- src/Cedar/Win32Com.cpp | 8 ++++---- src/Cedar/Win32Com.h | 8 ++++---- src/Cedar/WinJumpList.cpp | 8 ++++---- src/Cedar/WinUi.c | 8 ++++---- src/Cedar/WinUi.h | 8 ++++---- src/Cedar/Wpc.c | 8 ++++---- src/Cedar/Wpc.h | 8 ++++---- 128 files changed, 577 insertions(+), 609 deletions(-) (limited to 'src/Cedar') diff --git a/src/Cedar/Account.c b/src/Cedar/Account.c index 1127d4b0..010ba626 100644 --- a/src/Cedar/Account.c +++ b/src/Cedar/Account.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Account.h b/src/Cedar/Account.h index ad15460e..20581873 100644 --- a/src/Cedar/Account.h +++ b/src/Cedar/Account.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Admin.c b/src/Cedar/Admin.c index fcba5057..76787e0c 100644 --- a/src/Cedar/Admin.c +++ b/src/Cedar/Admin.c @@ -1,21 +1,21 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // 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: // - ELIN (https://github.com/el1n) -// Comments: Tetsuo Sugiyama, Ph.D. -// // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. @@ -1618,7 +1618,7 @@ UINT StGetHubMsg(ADMIN *a, RPC_MSG *t) else { FreeRpcMsg(t); - Zero(t, sizeof(t)); + Zero(t, sizeof(RPC_MSG)); t->Msg = GetHubMsg(h); @@ -6303,7 +6303,7 @@ UINT StGetLink(ADMIN *a, RPC_CREATE_LINK *t) StrCpy(hubname, sizeof(hubname), t->HubName); FreeRpcCreateLink(t); - Zero(t, sizeof(t)); + Zero(t, sizeof(RPC_CREATE_LINK)); StrCpy(t->HubName, sizeof(t->HubName), hubname); Lock(k->lock); @@ -7749,7 +7749,7 @@ UINT StGetHubRadius(ADMIN *a, RPC_RADIUS *t) return ERR_HUB_NOT_FOUND; } - Zero(t, sizeof(t)); + Zero(t, sizeof(RPC_RADIUS)); //GetRadiusServer(h, t->RadiusServerName, sizeof(t->RadiusServerName), // &t->RadiusPort, t->RadiusSecret, sizeof(t->RadiusSecret)); GetRadiusServerEx(h, t->RadiusServerName, sizeof(t->RadiusServerName), diff --git a/src/Cedar/Admin.h b/src/Cedar/Admin.h index e6aed5d3..2a1bddab 100644 --- a/src/Cedar/Admin.h +++ b/src/Cedar/Admin.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/AzureClient.c b/src/Cedar/AzureClient.c index c2938934..505b586f 100644 --- a/src/Cedar/AzureClient.c +++ b/src/Cedar/AzureClient.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/AzureClient.h b/src/Cedar/AzureClient.h index 4cb8d45f..c42c4f2c 100644 --- a/src/Cedar/AzureClient.h +++ b/src/Cedar/AzureClient.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/AzureServer.c b/src/Cedar/AzureServer.c index 027de70f..05402c7f 100644 --- a/src/Cedar/AzureServer.c +++ b/src/Cedar/AzureServer.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/AzureServer.h b/src/Cedar/AzureServer.h index 89631b11..b1743bdd 100644 --- a/src/Cedar/AzureServer.h +++ b/src/Cedar/AzureServer.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Bridge.c b/src/Cedar/Bridge.c index ebc8984d..72026532 100644 --- a/src/Cedar/Bridge.c +++ b/src/Cedar/Bridge.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Bridge.h b/src/Cedar/Bridge.h index d84fc045..3a9bc157 100644 --- a/src/Cedar/Bridge.h +++ b/src/Cedar/Bridge.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/BridgeUnix.c b/src/Cedar/BridgeUnix.c index f0925e13..6afdc205 100644 --- a/src/Cedar/BridgeUnix.c +++ b/src/Cedar/BridgeUnix.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // 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); - 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)) { @@ -2707,7 +2707,7 @@ void EthPutPacketLinuxIpRaw(ETH *e, void *data, UINT size) } 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); FreePacket(p); diff --git a/src/Cedar/BridgeUnix.h b/src/Cedar/BridgeUnix.h index 664c2747..dc9b18cc 100644 --- a/src/Cedar/BridgeUnix.h +++ b/src/Cedar/BridgeUnix.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/BridgeWin32.c b/src/Cedar/BridgeWin32.c index 7bdd9773..2807a931 100644 --- a/src/Cedar/BridgeWin32.c +++ b/src/Cedar/BridgeWin32.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/BridgeWin32.h b/src/Cedar/BridgeWin32.h index bccb7952..836303dc 100644 --- a/src/Cedar/BridgeWin32.h +++ b/src/Cedar/BridgeWin32.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/CM.c b/src/Cedar/CM.c index 96445159..0c752807 100644 --- a/src/Cedar/CM.c +++ b/src/Cedar/CM.c @@ -1,21 +1,21 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // 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: // - ELIN (https://github.com/el1n) -// Comments: Tetsuo Sugiyama, Ph.D. -// // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/CM.h b/src/Cedar/CM.h index d764c3a8..49445501 100644 --- a/src/Cedar/CM.h +++ b/src/Cedar/CM.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/CMInner.h b/src/Cedar/CMInner.h index 8ac763f7..5c7a44f8 100644 --- a/src/Cedar/CMInner.h +++ b/src/Cedar/CMInner.h @@ -1,21 +1,21 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // 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: // - ELIN (https://github.com/el1n) -// Comments: Tetsuo Sugiyama, Ph.D. -// // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Cedar.c b/src/Cedar/Cedar.c index cf4859c0..50d7d994 100644 --- a/src/Cedar/Cedar.c +++ b/src/Cedar/Cedar.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Cedar.h b/src/Cedar/Cedar.h index 8563a6cf..70537c47 100644 --- a/src/Cedar/Cedar.h +++ b/src/Cedar/Cedar.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. @@ -135,10 +135,10 @@ // Version number -#define CEDAR_VER 428 +#define CEDAR_VER 429 // Build Number -#define CEDAR_BUILD 9669 +#define CEDAR_BUILD 9678 // Beta number //#define BETA_NUMBER 3 @@ -157,12 +157,12 @@ #endif // BUILD_PLACE // Specifies the build date -#define BUILD_DATE_Y 2018 -#define BUILD_DATE_M 9 -#define BUILD_DATE_D 11 -#define BUILD_DATE_HO 11 -#define BUILD_DATE_MI 48 -#define BUILD_DATE_SE 34 +#define BUILD_DATE_Y 2019 +#define BUILD_DATE_M 2 +#define BUILD_DATE_D 28 +#define BUILD_DATE_HO 8 +#define BUILD_DATE_MI 44 +#define BUILD_DATE_SE 58 // Tolerable time difference #define ALLOW_TIMESTAMP_DIFF (UINT64)(3 * 24 * 60 * 60 * 1000) diff --git a/src/Cedar/CedarPch.c b/src/Cedar/CedarPch.c index 48c5583f..9fd37697 100644 --- a/src/Cedar/CedarPch.c +++ b/src/Cedar/CedarPch.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/CedarPch.h b/src/Cedar/CedarPch.h index ff66c0db..ea738090 100644 --- a/src/Cedar/CedarPch.h +++ b/src/Cedar/CedarPch.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/CedarType.h b/src/Cedar/CedarType.h index 612dc88f..b3e12b01 100644 --- a/src/Cedar/CedarType.h +++ b/src/Cedar/CedarType.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Client.c b/src/Cedar/Client.c index 4c09a47f..d49adbcb 100644 --- a/src/Cedar/Client.c +++ b/src/Cedar/Client.c @@ -1,21 +1,21 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // 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: // - nattoheaven (https://github.com/nattoheaven) -// Comments: Tetsuo Sugiyama, Ph.D. -// // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. @@ -8930,14 +8930,7 @@ bool CtSetPassword(CLIENT *c, RPC_CLIENT_PASSWORD *pass) { return false; } - if (pass->Password == NULL) - { - str = ""; - } - else - { - str = pass->Password; - } + str = pass->Password; if (StrCmp(str, "********") != 0) { @@ -10129,7 +10122,7 @@ char *DecryptPassword(BUF *b) } 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); FreeCrypt(c); @@ -10175,7 +10168,7 @@ BUF *EncryptPassword(char *password) size = StrLen(password) + 1; 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); FreeCrypt(c); diff --git a/src/Cedar/Client.h b/src/Cedar/Client.h index a423ebdf..f091e09d 100644 --- a/src/Cedar/Client.h +++ b/src/Cedar/Client.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Command.c b/src/Cedar/Command.c index 31bf8a29..4d226257 100644 --- a/src/Cedar/Command.c +++ b/src/Cedar/Command.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. @@ -711,6 +711,14 @@ bool CheckMemory() } 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; } @@ -19395,30 +19403,17 @@ UINT PsDhcpDisable(CONSOLE *c, char *cmd_name, wchar_t *str, void *param) } else { - bool ok = true; - t.UseDhcp = false; - if (ok == false) + ret = ScSetSecureNATOption(ps->Rpc, &t); + + if (ret != ERR_NO_ERROR) { - // Parameter is invalid - ret = ERR_INVALID_PARAMETER; + // An error has occured CmdPrintError(c, ret); FreeParamValueList(o); return ret; } - else - { - ret = ScSetSecureNATOption(ps->Rpc, &t); - - if (ret != ERR_NO_ERROR) - { - // An error has occured - CmdPrintError(c, ret); - FreeParamValueList(o); - return ret; - } - } } FreeParamValueList(o); diff --git a/src/Cedar/Command.h b/src/Cedar/Command.h index b86595f2..8178cde4 100644 --- a/src/Cedar/Command.h +++ b/src/Cedar/Command.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Connection.c b/src/Cedar/Connection.c index eb6dfa3d..d730a2b8 100644 --- a/src/Cedar/Connection.c +++ b/src/Cedar/Connection.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // 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++) { 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)) { // Processing of KeepAlive 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 SendKeepAlive(c, tcpsock); @@ -1181,7 +1181,7 @@ void ConnectionSend(CONNECTION *c, UINT64 now) UINT j; QUEUE *q; - if (s->UdpAccel != NULL) + if (s != NULL && s->UdpAccel != NULL) { UdpAccelSetTick(s->UdpAccel, now); } @@ -1589,7 +1589,7 @@ SEND_START: { // Packet data array void **datas = MallocFast(sizeof(void *) * num_packet); - UINT *sizes = MallocFast(sizeof(UINT *) * num_packet); + UINT *sizes = MallocFast(sizeof(UINT) * num_packet); UINT i; i = 0; diff --git a/src/Cedar/Connection.h b/src/Cedar/Connection.h index 441d02fc..70567a49 100644 --- a/src/Cedar/Connection.h +++ b/src/Cedar/Connection.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Console.c b/src/Cedar/Console.c index aeebb35d..d0f7fe59 100644 --- a/src/Cedar/Console.c +++ b/src/Cedar/Console.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Console.h b/src/Cedar/Console.h index 0cc75ffd..e181af92 100644 --- a/src/Cedar/Console.h +++ b/src/Cedar/Console.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/DDNS.c b/src/Cedar/DDNS.c index fddfe17a..755c4e23 100644 --- a/src/Cedar/DDNS.c +++ b/src/Cedar/DDNS.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/DDNS.h b/src/Cedar/DDNS.h index cb718851..86328b8f 100644 --- a/src/Cedar/DDNS.h +++ b/src/Cedar/DDNS.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Database.c b/src/Cedar/Database.c index b6d0fed9..ae96a191 100644 --- a/src/Cedar/Database.c +++ b/src/Cedar/Database.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Database.h b/src/Cedar/Database.h index 4c149db9..ed1e7973 100644 --- a/src/Cedar/Database.h +++ b/src/Cedar/Database.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/EM.c b/src/Cedar/EM.c index ebc88c2d..0b88982c 100644 --- a/src/Cedar/EM.c +++ b/src/Cedar/EM.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/EM.h b/src/Cedar/EM.h index 2e163be8..7c93f5dd 100644 --- a/src/Cedar/EM.h +++ b/src/Cedar/EM.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/EMInner.h b/src/Cedar/EMInner.h index 3458ca8b..3809cc83 100644 --- a/src/Cedar/EMInner.h +++ b/src/Cedar/EMInner.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/EtherLog.c b/src/Cedar/EtherLog.c index 1b4aba8a..77dd93ea 100644 --- a/src/Cedar/EtherLog.c +++ b/src/Cedar/EtherLog.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // 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 PACK *ElRpcServer(RPC *r, char *name, PACK *p) { - EL *e = (EL *)r->Param; + EL *e; PACK *ret; UINT err; bool ok; // Validate arguments - if (r == NULL || name == NULL || p == NULL || e == NULL) + if (r == NULL || name == NULL || p == NULL || r->Param == NULL) { return NULL; } + e = (EL *)r->Param; + ret = NewPack(); err = ERR_NO_ERROR; ok = false; diff --git a/src/Cedar/EtherLog.h b/src/Cedar/EtherLog.h index 59191ea3..7ef5ad85 100644 --- a/src/Cedar/EtherLog.h +++ b/src/Cedar/EtherLog.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Hub.c b/src/Cedar/Hub.c index 54d1d183..0dd46e9a 100644 --- a/src/Cedar/Hub.c +++ b/src/Cedar/Hub.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. @@ -3700,7 +3700,7 @@ bool HubPaPutPacket(SESSION *s, void *data, UINT size) pa->Now = Tick64(); // 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 session_mss = (s->AdjustMss == 0 ? INFINITE : s->AdjustMss); @@ -3779,7 +3779,7 @@ bool HubPaPutPacket(SESSION *s, void *data, UINT size) CancelList(s->CancelList); // Yield - if (hub->Option != NULL && hub->Option->YieldAfterStorePacket) + if (hub != NULL && hub->Option != NULL && hub->Option->YieldAfterStorePacket) { YieldCpu(); } @@ -3844,7 +3844,7 @@ LABEL_TRY_AGAIN: 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 if (packet->TypeL7 == L7_DHCPV4) @@ -5361,6 +5361,7 @@ void DeleteOldIpTableEntry(LIST *o) if (e->UpdatedTime <= oldest_time) { 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 UCHAR *mac = packet->MacAddressSrc; @@ -5621,7 +5622,7 @@ bool StorePacketFilterByPolicy(SESSION *s, PKT *p) hub = s->Hub; - if (hub->Option != NULL) + if (hub != NULL && hub->Option != NULL) { no_heavy = hub->Option->DoNotSaveHeavySecurityLogs; } @@ -6098,7 +6099,7 @@ void IntoTrafficLimiter(TRAFFIC_LIMITER *tr, PKT *p) } // Value increase - tr->Value += (UINT64)(p->PacketSize * 8); + tr->Value += (UINT64)p->PacketSize * (UINT64)8; } // The bandwidth reduction by traffic limiter diff --git a/src/Cedar/Hub.h b/src/Cedar/Hub.h index 5833df8e..5dabc8a5 100644 --- a/src/Cedar/Hub.h +++ b/src/Cedar/Hub.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/IPsec.c b/src/Cedar/IPsec.c index 3d1402dc..4c1b2c79 100644 --- a/src/Cedar/IPsec.c +++ b/src/Cedar/IPsec.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/IPsec.h b/src/Cedar/IPsec.h index 2a9acfbd..4298509f 100644 --- a/src/Cedar/IPsec.h +++ b/src/Cedar/IPsec.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/IPsec_EtherIP.c b/src/Cedar/IPsec_EtherIP.c index 0ef617fc..bd385cb1 100644 --- a/src/Cedar/IPsec_EtherIP.c +++ b/src/Cedar/IPsec_EtherIP.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/IPsec_EtherIP.h b/src/Cedar/IPsec_EtherIP.h index f5ffe557..0358e267 100644 --- a/src/Cedar/IPsec_EtherIP.h +++ b/src/Cedar/IPsec_EtherIP.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/IPsec_IKE.c b/src/Cedar/IPsec_IKE.c index f9384d61..7e77ae1e 100644 --- a/src/Cedar/IPsec_IKE.c +++ b/src/Cedar/IPsec_IKE.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // 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 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->ExpiresSoftTick = ike->Now + span; //sa->ExpiresSoftTick = ike->Now + (UINT64)5000; @@ -3842,6 +3842,10 @@ bool IkeIsVendorIdExists(IKE_PACKET *p, char *str) for (i = 0;i < num;i++) { IKE_PACKET_PAYLOAD *payload = IkeGetPayload(p->PayloadList, IKE_PAYLOAD_VENDOR_ID, i); + if (payload == NULL) + { + break; + } if (CompareBuf(payload->Payload.VendorId.Data, buf)) { diff --git a/src/Cedar/IPsec_IKE.h b/src/Cedar/IPsec_IKE.h index 076f54e3..6e4cd976 100644 --- a/src/Cedar/IPsec_IKE.h +++ b/src/Cedar/IPsec_IKE.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/IPsec_IPC.c b/src/Cedar/IPsec_IPC.c index ae9b3458..d933929f 100644 --- a/src/Cedar/IPsec_IPC.c +++ b/src/Cedar/IPsec_IPC.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/IPsec_IPC.h b/src/Cedar/IPsec_IPC.h index 32b90794..4181eff2 100644 --- a/src/Cedar/IPsec_IPC.h +++ b/src/Cedar/IPsec_IPC.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/IPsec_IkePacket.c b/src/Cedar/IPsec_IkePacket.c index ebff142f..777b03e6 100644 --- a/src/Cedar/IPsec_IkePacket.c +++ b/src/Cedar/IPsec_IkePacket.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/IPsec_IkePacket.h b/src/Cedar/IPsec_IkePacket.h index 06e3434b..1b240632 100644 --- a/src/Cedar/IPsec_IkePacket.h +++ b/src/Cedar/IPsec_IkePacket.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/IPsec_L2TP.c b/src/Cedar/IPsec_L2TP.c index e036e1a5..e979e85f 100644 --- a/src/Cedar/IPsec_L2TP.c +++ b/src/Cedar/IPsec_L2TP.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/IPsec_L2TP.h b/src/Cedar/IPsec_L2TP.h index 320a6c60..ae3d4632 100644 --- a/src/Cedar/IPsec_L2TP.h +++ b/src/Cedar/IPsec_L2TP.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/IPsec_PPP.c b/src/Cedar/IPsec_PPP.c index 10a07e7a..e66cf7cf 100644 --- a/src/Cedar/IPsec_PPP.c +++ b/src/Cedar/IPsec_PPP.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // 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]; // Validate arguments Zero(dst, sizeof(ETHERIP_ID)); - if (cedar == NULL || src == NULL || dst == NULL) + if (cedar == NULL || dst == NULL) { return false; } @@ -1318,7 +1318,7 @@ PPP_PACKET *PPPProcessRequestPacket(PPP_SESSION *p, PPP_PACKET *req) t = 1; } - p->DhcpRenewInterval = (UINT64)(t * 1000); + p->DhcpRenewInterval = (UINT64)t * (UINT64)1000; p->DhcpNextRenewTime = Tick64() + p->DhcpRenewInterval; if (true) @@ -2143,10 +2143,6 @@ PPP_PACKET *ParsePPPPacket(void *data, UINT size) buf = (UCHAR *)data; // Address - if (size < 1) - { - goto LABEL_ERROR; - } if (buf[0] != 0xff) { goto LABEL_ERROR; diff --git a/src/Cedar/IPsec_PPP.h b/src/Cedar/IPsec_PPP.h index 2ef52b80..46ab7e63 100644 --- a/src/Cedar/IPsec_PPP.h +++ b/src/Cedar/IPsec_PPP.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/IPsec_Win7.c b/src/Cedar/IPsec_Win7.c index cdbc654a..6d6ff48d 100644 --- a/src/Cedar/IPsec_Win7.c +++ b/src/Cedar/IPsec_Win7.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/IPsec_Win7.h b/src/Cedar/IPsec_Win7.h index b7b43fcc..777f30e1 100644 --- a/src/Cedar/IPsec_Win7.h +++ b/src/Cedar/IPsec_Win7.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/IPsec_Win7Inner.h b/src/Cedar/IPsec_Win7Inner.h index a760f979..fc48c4e3 100644 --- a/src/Cedar/IPsec_Win7Inner.h +++ b/src/Cedar/IPsec_Win7Inner.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Interop_OpenVPN.c b/src/Cedar/Interop_OpenVPN.c index 11e86a90..f13a4d62 100644 --- a/src/Cedar/Interop_OpenVPN.c +++ b/src/Cedar/Interop_OpenVPN.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Interop_OpenVPN.h b/src/Cedar/Interop_OpenVPN.h index c678eec6..f394cbcc 100644 --- a/src/Cedar/Interop_OpenVPN.h +++ b/src/Cedar/Interop_OpenVPN.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Interop_SSTP.c b/src/Cedar/Interop_SSTP.c index 9047babb..e76ef490 100644 --- a/src/Cedar/Interop_SSTP.c +++ b/src/Cedar/Interop_SSTP.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Interop_SSTP.h b/src/Cedar/Interop_SSTP.h index 39f5f43b..3c5d64c6 100644 --- a/src/Cedar/Interop_SSTP.h +++ b/src/Cedar/Interop_SSTP.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Layer3.c b/src/Cedar/Layer3.c index 177a0c37..06c46a86 100644 --- a/src/Cedar/Layer3.c +++ b/src/Cedar/Layer3.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Layer3.h b/src/Cedar/Layer3.h index 3fb5dc81..7d64fcc9 100644 --- a/src/Cedar/Layer3.h +++ b/src/Cedar/Layer3.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Link.c b/src/Cedar/Link.c index 9c1b4791..d8c170b3 100644 --- a/src/Cedar/Link.c +++ b/src/Cedar/Link.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Link.h b/src/Cedar/Link.h index f8d6e083..1429c2d6 100644 --- a/src/Cedar/Link.h +++ b/src/Cedar/Link.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Listener.c b/src/Cedar/Listener.c index f63d3c95..9fb88b0e 100644 --- a/src/Cedar/Listener.c +++ b/src/Cedar/Listener.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Listener.h b/src/Cedar/Listener.h index cb386e89..50a89f77 100644 --- a/src/Cedar/Listener.h +++ b/src/Cedar/Listener.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Logging.c b/src/Cedar/Logging.c index 58d6d50a..e3d88b92 100644 --- a/src/Cedar/Logging.c +++ b/src/Cedar/Logging.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. @@ -1141,14 +1141,7 @@ bool PacketLog(HUB *hub, SESSION *src_session, SESSION *dest_session, PKT *packe pl->Cedar = hub->Cedar; pl->Packet = p; pl->NoLog = no_log; - if (src_session != NULL) - { - pl->SrcSessionName = CopyStr(src_session->Name); - } - else - { - pl->SrcSessionName = CopyStr(""); - } + pl->SrcSessionName = CopyStr(src_session->Name); if (dest_session != NULL) { pl->DestSessionName = CopyStr(dest_session->Name); @@ -2472,7 +2465,7 @@ void MakeLogFileNameStringFromTick(LOG *g, char *str, UINT size, UINT64 tick, UI break; default: // Without switching - snprintf(str, size, ""); + StrCpy(str, size, ""); break; } diff --git a/src/Cedar/Logging.h b/src/Cedar/Logging.h index ee43f371..11fbe598 100644 --- a/src/Cedar/Logging.h +++ b/src/Cedar/Logging.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/NM.c b/src/Cedar/NM.c index ab6df6b3..852b6f9b 100644 --- a/src/Cedar/NM.c +++ b/src/Cedar/NM.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/NM.h b/src/Cedar/NM.h index dce9ebe9..9b37353c 100644 --- a/src/Cedar/NM.h +++ b/src/Cedar/NM.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/NMInner.h b/src/Cedar/NMInner.h index d8d48017..b247281d 100644 --- a/src/Cedar/NMInner.h +++ b/src/Cedar/NMInner.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Nat.c b/src/Cedar/Nat.c index c8583c9a..8d289479 100644 --- a/src/Cedar/Nat.c +++ b/src/Cedar/Nat.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. @@ -299,7 +299,7 @@ RPC *NatAdminConnect(CEDAR *cedar, char *hostname, UINT port, void *hashed_passw // RPC server function PACK *NiRpcServer(RPC *r, char *name, PACK *p) { - NAT *n = (NAT *)r->Param; + NAT *n; PACK *ret; UINT err; bool ok; @@ -309,6 +309,8 @@ PACK *NiRpcServer(RPC *r, char *name, PACK *p) return NULL; } + n = (NAT *)r->Param; + ret = NewPack(); err = ERR_NO_ERROR; ok = false; diff --git a/src/Cedar/Nat.h b/src/Cedar/Nat.h index e5e7e751..e6dfc4c5 100644 --- a/src/Cedar/Nat.h +++ b/src/Cedar/Nat.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/NativeStack.c b/src/Cedar/NativeStack.c index f73bb3d3..5fe73e90 100644 --- a/src/Cedar/NativeStack.c +++ b/src/Cedar/NativeStack.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/NativeStack.h b/src/Cedar/NativeStack.h index b5b75f2f..f5443d0d 100644 --- a/src/Cedar/NativeStack.h +++ b/src/Cedar/NativeStack.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/NullLan.c b/src/Cedar/NullLan.c index 6fbe3a60..98c77293 100644 --- a/src/Cedar/NullLan.c +++ b/src/Cedar/NullLan.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/NullLan.h b/src/Cedar/NullLan.h index e136cc34..f70f07c2 100644 --- a/src/Cedar/NullLan.h +++ b/src/Cedar/NullLan.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Protocol.c b/src/Cedar/Protocol.c index d2d974ec..ccf5ac1c 100644 --- a/src/Cedar/Protocol.c +++ b/src/Cedar/Protocol.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. @@ -2901,14 +2901,11 @@ bool ServerAccept(CONNECTION *c) // VLAN ID if (assigned_vlan_id != 0) { - if (policy != NULL) - { if (policy->VLanId == 0) { policy->VLanId = assigned_vlan_id; } } - } // Create a Session StrLower(username); @@ -3100,11 +3097,7 @@ bool ServerAccept(CONNECTION *c) s->QoS = qos; s->NoReconnectToSession = no_reconnect_to_session; - - if (policy != NULL) - { s->VLanId = policy->VLanId; - } // User name s->Username = CopyStr(username); diff --git a/src/Cedar/Protocol.h b/src/Cedar/Protocol.h index 8179c681..03618b28 100644 --- a/src/Cedar/Protocol.h +++ b/src/Cedar/Protocol.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Radius.c b/src/Cedar/Radius.c index 8740e753..c4481755 100644 --- a/src/Cedar/Radius.c +++ b/src/Cedar/Radius.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Radius.h b/src/Cedar/Radius.h index e3153230..bba7fe52 100644 --- a/src/Cedar/Radius.h +++ b/src/Cedar/Radius.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Remote.c b/src/Cedar/Remote.c index cd09432f..0240ba96 100644 --- a/src/Cedar/Remote.c +++ b/src/Cedar/Remote.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Remote.h b/src/Cedar/Remote.h index e0144295..b8789cf4 100644 --- a/src/Cedar/Remote.h +++ b/src/Cedar/Remote.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/SM.c b/src/Cedar/SM.c index c842bd9a..8f721183 100644 --- a/src/Cedar/SM.c +++ b/src/Cedar/SM.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/SM.h b/src/Cedar/SM.h index 6bc333d7..a19ad9c5 100644 --- a/src/Cedar/SM.h +++ b/src/Cedar/SM.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/SMInner.h b/src/Cedar/SMInner.h index 93e6ce18..b078f9bc 100644 --- a/src/Cedar/SMInner.h +++ b/src/Cedar/SMInner.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/SW.c b/src/Cedar/SW.c index dcbaf498..597cdaa5 100644 --- a/src/Cedar/SW.c +++ b/src/Cedar/SW.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/SW.h b/src/Cedar/SW.h index 00fe6cac..57702429 100644 --- a/src/Cedar/SW.h +++ b/src/Cedar/SW.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/SWInner.h b/src/Cedar/SWInner.h index eea77265..e4d33030 100644 --- a/src/Cedar/SWInner.h +++ b/src/Cedar/SWInner.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Sam.c b/src/Cedar/Sam.c index 740938e8..e6648469 100644 --- a/src/Cedar/Sam.c +++ b/src/Cedar/Sam.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Sam.h b/src/Cedar/Sam.h index bec4f0b9..fde43827 100644 --- a/src/Cedar/Sam.h +++ b/src/Cedar/Sam.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/SeLowUser.c b/src/Cedar/SeLowUser.c index 3ad6dd0e..ae740ee1 100644 --- a/src/Cedar/SeLowUser.c +++ b/src/Cedar/SeLowUser.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // SeLow: SoftEther Lightweight Network Protocol // -// 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/SeLowUser.h b/src/Cedar/SeLowUser.h index 9377508c..dd2f43e9 100644 --- a/src/Cedar/SeLowUser.h +++ b/src/Cedar/SeLowUser.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // SeLow: SoftEther Lightweight Network Protocol // -// 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/SecureInfo.c b/src/Cedar/SecureInfo.c index 3b8943c5..c5159624 100644 --- a/src/Cedar/SecureInfo.c +++ b/src/Cedar/SecureInfo.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/SecureInfo.h b/src/Cedar/SecureInfo.h index 8c89991f..7f4fb19d 100644 --- a/src/Cedar/SecureInfo.h +++ b/src/Cedar/SecureInfo.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/SecureNAT.c b/src/Cedar/SecureNAT.c index 51021241..e415ac2e 100644 --- a/src/Cedar/SecureNAT.c +++ b/src/Cedar/SecureNAT.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/SecureNAT.h b/src/Cedar/SecureNAT.h index 530b1bd3..879791b6 100644 --- a/src/Cedar/SecureNAT.h +++ b/src/Cedar/SecureNAT.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Server.c b/src/Cedar/Server.c index 2a100ecb..0cafbf2b 100644 --- a/src/Cedar/Server.c +++ b/src/Cedar/Server.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. @@ -1359,7 +1359,7 @@ void GetServerCaps(SERVER *s, CAPSLIST *t) GetServerCapsMain(s, s->CapsListCache); } - Copy(t, s->CapsListCache, sizeof(s->CapsListCache)); + Copy(t, s->CapsListCache, sizeof(CAPSLIST)); } Unlock(s->CapsCacheLock); } @@ -2103,6 +2103,12 @@ UINT SiCalcPoint(SERVER *s, UINT num, UINT weight) server_max_sessions = GetServerCapsInt(s, "i_max_sessions"); + if (server_max_sessions == 0) + { + // Avoid divide by zero + server_max_sessions = 1; + } + return (UINT)(((double)server_max_sessions - MIN((double)num * 100.0 / (double)weight, (double)server_max_sessions)) * (double)FARM_BASE_POINT / (double)server_max_sessions); @@ -2532,21 +2538,6 @@ void SiInitDefaultHubList(SERVER *s) SiSetDefaultLogSetting(&g); SetHubLogSetting(h, &g); - { - UINT i; - for (i = 0;i < 0;i++) - { - char tmp[MAX_SIZE]; - USER *u; - sprintf(tmp, "user%u", i); - AcLock(h); - u = NewUser(tmp, L"test", L"", AUTHTYPE_ANONYMOUS, NULL); - AcAddUser(h, u); - ReleaseUser(u); - AcUnlock(h); - } - } - ReleaseHub(h); } @@ -9447,7 +9438,7 @@ void SiHubUpdateProc(HUB *h) SERVER *s; UINT i; // Validate arguments - if (h == NULL || h->Cedar->Server == NULL || h->Cedar->Server->ServerType != SERVER_TYPE_FARM_CONTROLLER) + if (h == NULL || h->Cedar == NULL || h->Cedar->Server == NULL || h->Cedar->Server->ServerType != SERVER_TYPE_FARM_CONTROLLER) { return; } diff --git a/src/Cedar/Server.h b/src/Cedar/Server.h index bf046952..5d1ecdd8 100644 --- a/src/Cedar/Server.h +++ b/src/Cedar/Server.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Session.c b/src/Cedar/Session.c index ed1d349e..d3af88e4 100644 --- a/src/Cedar/Session.c +++ b/src/Cedar/Session.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. @@ -209,7 +209,7 @@ void SessionMain(SESSION *s) s->LastCommTime = Tick64(); if (s->ServerMode == false) { - s->NextConnectionTime = Tick64() + (UINT64)(s->ClientOption->AdditionalConnectionInterval * 1000); + s->NextConnectionTime = Tick64() + (UINT64)((UINT64)s->ClientOption->AdditionalConnectionInterval * (UINT64)1000); } s->NumConnectionsEatablished++; @@ -1006,7 +1006,7 @@ void ClientAdditionalConnectChance(SESSION *s) (s->NextConnectionTime <= now)) { // Start the work to put an additional connection - s->NextConnectionTime = now + (UINT64)(s->ClientOption->AdditionalConnectionInterval * 1000); + s->NextConnectionTime = now + ((UINT64)s->ClientOption->AdditionalConnectionInterval * (UINT64)1000); SessionAdditionalConnect(s); } else diff --git a/src/Cedar/Session.h b/src/Cedar/Session.h index 38163a7b..316a0355 100644 --- a/src/Cedar/Session.h +++ b/src/Cedar/Session.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/UT.c b/src/Cedar/UT.c index ede5d7ff..388b43fb 100644 --- a/src/Cedar/UT.c +++ b/src/Cedar/UT.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/UT.h b/src/Cedar/UT.h index 8440d2e7..2a4a3033 100644 --- a/src/Cedar/UT.h +++ b/src/Cedar/UT.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/UdpAccel.c b/src/Cedar/UdpAccel.c index 757ce9b8..c9494b85 100644 --- a/src/Cedar/UdpAccel.c +++ b/src/Cedar/UdpAccel.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/UdpAccel.h b/src/Cedar/UdpAccel.h index e70dacd9..3b7af61c 100644 --- a/src/Cedar/UdpAccel.h +++ b/src/Cedar/UdpAccel.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/VG.c b/src/Cedar/VG.c index 991be94c..627aaa57 100644 --- a/src/Cedar/VG.c +++ b/src/Cedar/VG.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/VG.h b/src/Cedar/VG.h index cef84bf9..086f4cce 100644 --- a/src/Cedar/VG.h +++ b/src/Cedar/VG.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/VLan.c b/src/Cedar/VLan.c index ae4ade2c..fd559748 100644 --- a/src/Cedar/VLan.c +++ b/src/Cedar/VLan.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/VLan.h b/src/Cedar/VLan.h index 8e44a7f6..44ffcfc9 100644 --- a/src/Cedar/VLan.h +++ b/src/Cedar/VLan.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/VLanUnix.c b/src/Cedar/VLanUnix.c index 46a6c851..82bc5178 100644 --- a/src/Cedar/VLanUnix.c +++ b/src/Cedar/VLanUnix.c @@ -1,21 +1,21 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // 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: // - nattoheaven (https://github.com/nattoheaven) -// Comments: Tetsuo Sugiyama, Ph.D. -// // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/VLanUnix.h b/src/Cedar/VLanUnix.h index edbfe91c..fdb74db8 100644 --- a/src/Cedar/VLanUnix.h +++ b/src/Cedar/VLanUnix.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/VLanWin32.c b/src/Cedar/VLanWin32.c index dbb2b15f..85636fcb 100644 --- a/src/Cedar/VLanWin32.c +++ b/src/Cedar/VLanWin32.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/VLanWin32.h b/src/Cedar/VLanWin32.h index b752769c..97fe8e63 100644 --- a/src/Cedar/VLanWin32.h +++ b/src/Cedar/VLanWin32.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Virtual.c b/src/Cedar/Virtual.c index b1b10a0f..852cba11 100644 --- a/src/Cedar/Virtual.c +++ b/src/Cedar/Virtual.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. @@ -1072,9 +1072,9 @@ void NnFragmentedIpReceived(NATIVE_NAT *t, PKT *packet) c = NnInsertIpCombine( t, ip->SrcIP, ip->DstIP, Endian16(ip->Identification), ip->Protocol, packet->BroadcastPacket, ip->TimeToLive, false); - c->MaxL3Size = MAX(c->MaxL3Size, l3_size); if (c != NULL) { + c->MaxL3Size = MAX(c->MaxL3Size, l3_size); NnCombineIp(t, c, offset, data, size, last_packet, head_ip_header_data, head_ip_header_size); } } @@ -5310,7 +5310,7 @@ TCP_RESET: seq64 = n->RecvSeq + (UINT64)seq - (n->RecvSeqInit + n->RecvSeq) % X32; if ((n->RecvSeqInit + n->RecvSeq) % X32 > seq) { - if (((n->RecvSeqInit + n->RecvSeq) % X32 - ack) >= 0x80000000) + if (((n->RecvSeqInit + n->RecvSeq) % X32 - seq) >= 0x80000000) { seq64 = n->RecvSeq + (UINT64)seq + X32 - (n->RecvSeqInit + n->RecvSeq) % X32; } diff --git a/src/Cedar/Virtual.h b/src/Cedar/Virtual.h index 780658a3..50c4b81c 100644 --- a/src/Cedar/Virtual.h +++ b/src/Cedar/Virtual.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/WaterMark.c b/src/Cedar/WaterMark.c index 9699dc7a..ab1a7523 100644 --- a/src/Cedar/WaterMark.c +++ b/src/Cedar/WaterMark.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/WaterMark.h b/src/Cedar/WaterMark.h index 8989363a..bb15b399 100644 --- a/src/Cedar/WaterMark.h +++ b/src/Cedar/WaterMark.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/WebUI.c b/src/Cedar/WebUI.c index 21e315ca..4b5a60d6 100644 --- a/src/Cedar/WebUI.c +++ b/src/Cedar/WebUI.c @@ -1,19 +1,18 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // // Author: Tetsuo Sugiyama -// Comments: Tetsuo Sugiyama, Ph.D. -// // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. @@ -1222,7 +1221,7 @@ static wchar_t *WpSecureNAT(WEBUI *wu, LIST *params) // Get the enable / disable state of the current SecureNAT { RPC_HUB_STATUS t; - Zero(&t, sizeof(&t)); + Zero(&t, sizeof(t)); StrCpy(t.HubName, sizeof(t.HubName), hubname); retcode = StGetHubStatus(context->Admin, &t); @@ -1649,7 +1648,7 @@ static LIST *WuAnalyzeTarget(char *target,char *filename, UINT size) while(*body != '=' && *body != '\0') { - *body ++; + body ++; } if(*body == '=') { diff --git a/src/Cedar/WebUI.h b/src/Cedar/WebUI.h index f866e57e..66ef044a 100644 --- a/src/Cedar/WebUI.h +++ b/src/Cedar/WebUI.h @@ -1,19 +1,18 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // // Author: Tetsuo Sugiyama -// Comments: Tetsuo Sugiyama, Ph.D. -// // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Win32Com.cpp b/src/Cedar/Win32Com.cpp index 1100854b..3b5f5023 100644 --- a/src/Cedar/Win32Com.cpp +++ b/src/Cedar/Win32Com.cpp @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Win32Com.h b/src/Cedar/Win32Com.h index fdfa8143..7b026bfc 100644 --- a/src/Cedar/Win32Com.h +++ b/src/Cedar/Win32Com.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/WinJumpList.cpp b/src/Cedar/WinJumpList.cpp index 876f3a1d..d4c62fbc 100644 --- a/src/Cedar/WinJumpList.cpp +++ b/src/Cedar/WinJumpList.cpp @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/WinUi.c b/src/Cedar/WinUi.c index d6c71376..6d7f2414 100644 --- a/src/Cedar/WinUi.c +++ b/src/Cedar/WinUi.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/WinUi.h b/src/Cedar/WinUi.h index d0b39db9..7e3795d0 100644 --- a/src/Cedar/WinUi.h +++ b/src/Cedar/WinUi.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Wpc.c b/src/Cedar/Wpc.c index 9a3e5beb..7f967842 100644 --- a/src/Cedar/Wpc.c +++ b/src/Cedar/Wpc.c @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. diff --git a/src/Cedar/Wpc.h b/src/Cedar/Wpc.h index 6353d3b5..bc409cef 100644 --- a/src/Cedar/Wpc.h +++ b/src/Cedar/Wpc.h @@ -1,19 +1,19 @@ // SoftEther VPN Source Code - Stable Edition Repository // 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) SoftEther VPN Project, University of Tsukuba, Japan. // Copyright (c) SoftEther Corporation. +Copyright (c) all contributors on SoftEther VPN project in GitHub. // // All Rights Reserved. // // http://www.softether.org/ // -// Author: Daiyuu Nobori, Ph.D. -// Comments: Tetsuo Sugiyama, 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 // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // version 2 as published by the Free Software Foundation. -- cgit v1.2.3