Skip to content

Commit befc7cc

Browse files
kareldonkkareldonk
committed
Merge branch 'dev'
2 parents 3b745e9 + 8013214 commit befc7cc

File tree

164 files changed

+8054
-2753
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+8054
-2753
lines changed

‎Examples/QuantumGateConsole/QuantumGateConsole.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,26 +29,26 @@
2929
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3030
<ConfigurationType>Application</ConfigurationType>
3131
<UseDebugLibraries>true</UseDebugLibraries>
32-
<PlatformToolset>v142</PlatformToolset>
32+
<PlatformToolset>v143</PlatformToolset>
3333
<CharacterSet>Unicode</CharacterSet>
3434
</PropertyGroup>
3535
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3636
<ConfigurationType>Application</ConfigurationType>
3737
<UseDebugLibraries>false</UseDebugLibraries>
38-
<PlatformToolset>v142</PlatformToolset>
38+
<PlatformToolset>v143</PlatformToolset>
3939
<WholeProgramOptimization>true</WholeProgramOptimization>
4040
<CharacterSet>Unicode</CharacterSet>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4343
<ConfigurationType>Application</ConfigurationType>
4444
<UseDebugLibraries>true</UseDebugLibraries>
45-
<PlatformToolset>v142</PlatformToolset>
45+
<PlatformToolset>v143</PlatformToolset>
4646
<CharacterSet>Unicode</CharacterSet>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4949
<ConfigurationType>Application</ConfigurationType>
5050
<UseDebugLibraries>false</UseDebugLibraries>
51-
<PlatformToolset>v142</PlatformToolset>
51+
<PlatformToolset>v143</PlatformToolset>
5252
<WholeProgramOptimization>true</WholeProgramOptimization>
5353
<CharacterSet>Unicode</CharacterSet>
5454
</PropertyGroup>

‎Examples/QuantumGateExtender/QuantumGateExtender.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ int main()
183183
QuantumGate::ConnectParameters params;
184184

185185
// Connect to the first instance on the local host
186-
params.PeerIPEndpoint = QuantumGate::IPEndpoint(QuantumGate::IPEndpoint::Protocol::TCP,
187-
QuantumGate::IPAddress(L"127.0.0.1"), 999);
186+
params.PeerEndpoint = QuantumGate::IPEndpoint(QuantumGate::IPEndpoint::Protocol::TCP,
187+
QuantumGate::IPAddress(L"127.0.0.1"), 999);
188188

189189
// This version of the ConnectTo function will block until connection succeeds or fails;
190190
// use a second parameter to supply a callback function (may be nullptr) for async connect

‎Examples/QuantumGateExtender/QuantumGateExtender.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,26 +29,26 @@
2929
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3030
<ConfigurationType>Application</ConfigurationType>
3131
<UseDebugLibraries>true</UseDebugLibraries>
32-
<PlatformToolset>v142</PlatformToolset>
32+
<PlatformToolset>v143</PlatformToolset>
3333
<CharacterSet>Unicode</CharacterSet>
3434
</PropertyGroup>
3535
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3636
<ConfigurationType>Application</ConfigurationType>
3737
<UseDebugLibraries>false</UseDebugLibraries>
38-
<PlatformToolset>v142</PlatformToolset>
38+
<PlatformToolset>v143</PlatformToolset>
3939
<WholeProgramOptimization>true</WholeProgramOptimization>
4040
<CharacterSet>Unicode</CharacterSet>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4343
<ConfigurationType>Application</ConfigurationType>
4444
<UseDebugLibraries>true</UseDebugLibraries>
45-
<PlatformToolset>v142</PlatformToolset>
45+
<PlatformToolset>v143</PlatformToolset>
4646
<CharacterSet>Unicode</CharacterSet>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4949
<ConfigurationType>Application</ConfigurationType>
5050
<UseDebugLibraries>false</UseDebugLibraries>
51-
<PlatformToolset>v142</PlatformToolset>
51+
<PlatformToolset>v143</PlatformToolset>
5252
<WholeProgramOptimization>true</WholeProgramOptimization>
5353
<CharacterSet>Unicode</CharacterSet>
5454
</PropertyGroup>

‎Examples/QuantumGateExtenderHandshake/QuantumGateExtenderHandshake.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,8 @@ int main()
185185
QuantumGate::ConnectParameters params;
186186

187187
// Connect to the first instance on the local host
188-
params.PeerIPEndpoint = QuantumGate::IPEndpoint(QuantumGate::IPEndpoint::Protocol::TCP,
189-
QuantumGate::IPAddress(L"127.0.0.1"), 999);
188+
params.PeerEndpoint = QuantumGate::IPEndpoint(QuantumGate::IPEndpoint::Protocol::TCP,
189+
QuantumGate::IPAddress(L"127.0.0.1"), 999);
190190

191191
// This version of the ConnectTo function will block until connection succeeds or fails;
192192
// use a second parameter to supply a callback function (may be nullptr) for async connect

‎Examples/QuantumGateExtenderHandshake/QuantumGateExtenderHandshake.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,26 +29,26 @@
2929
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3030
<ConfigurationType>Application</ConfigurationType>
3131
<UseDebugLibraries>true</UseDebugLibraries>
32-
<PlatformToolset>v142</PlatformToolset>
32+
<PlatformToolset>v143</PlatformToolset>
3333
<CharacterSet>Unicode</CharacterSet>
3434
</PropertyGroup>
3535
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3636
<ConfigurationType>Application</ConfigurationType>
3737
<UseDebugLibraries>false</UseDebugLibraries>
38-
<PlatformToolset>v142</PlatformToolset>
38+
<PlatformToolset>v143</PlatformToolset>
3939
<WholeProgramOptimization>true</WholeProgramOptimization>
4040
<CharacterSet>Unicode</CharacterSet>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4343
<ConfigurationType>Application</ConfigurationType>
4444
<UseDebugLibraries>true</UseDebugLibraries>
45-
<PlatformToolset>v142</PlatformToolset>
45+
<PlatformToolset>v143</PlatformToolset>
4646
<CharacterSet>Unicode</CharacterSet>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4949
<ConfigurationType>Application</ConfigurationType>
5050
<UseDebugLibraries>false</UseDebugLibraries>
51-
<PlatformToolset>v142</PlatformToolset>
51+
<PlatformToolset>v143</PlatformToolset>
5252
<WholeProgramOptimization>true</WholeProgramOptimization>
5353
<CharacterSet>Unicode</CharacterSet>
5454
</PropertyGroup>

‎Examples/QuantumGateExtenderModule/QuantumGateExtenderModule.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,26 +29,26 @@
2929
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3030
<ConfigurationType>DynamicLibrary</ConfigurationType>
3131
<UseDebugLibraries>true</UseDebugLibraries>
32-
<PlatformToolset>v142</PlatformToolset>
32+
<PlatformToolset>v143</PlatformToolset>
3333
<CharacterSet>Unicode</CharacterSet>
3434
</PropertyGroup>
3535
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3636
<ConfigurationType>DynamicLibrary</ConfigurationType>
3737
<UseDebugLibraries>false</UseDebugLibraries>
38-
<PlatformToolset>v142</PlatformToolset>
38+
<PlatformToolset>v143</PlatformToolset>
3939
<WholeProgramOptimization>true</WholeProgramOptimization>
4040
<CharacterSet>Unicode</CharacterSet>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4343
<ConfigurationType>DynamicLibrary</ConfigurationType>
4444
<UseDebugLibraries>true</UseDebugLibraries>
45-
<PlatformToolset>v142</PlatformToolset>
45+
<PlatformToolset>v143</PlatformToolset>
4646
<CharacterSet>Unicode</CharacterSet>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4949
<ConfigurationType>DynamicLibrary</ConfigurationType>
5050
<UseDebugLibraries>false</UseDebugLibraries>
51-
<PlatformToolset>v142</PlatformToolset>
51+
<PlatformToolset>v143</PlatformToolset>
5252
<WholeProgramOptimization>true</WholeProgramOptimization>
5353
<CharacterSet>Unicode</CharacterSet>
5454
</PropertyGroup>

‎Examples/QuantumGateStartup/QuantumGateStartup.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,26 +29,26 @@
2929
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3030
<ConfigurationType>Application</ConfigurationType>
3131
<UseDebugLibraries>true</UseDebugLibraries>
32-
<PlatformToolset>v142</PlatformToolset>
32+
<PlatformToolset>v143</PlatformToolset>
3333
<CharacterSet>Unicode</CharacterSet>
3434
</PropertyGroup>
3535
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3636
<ConfigurationType>Application</ConfigurationType>
3737
<UseDebugLibraries>false</UseDebugLibraries>
38-
<PlatformToolset>v142</PlatformToolset>
38+
<PlatformToolset>v143</PlatformToolset>
3939
<WholeProgramOptimization>true</WholeProgramOptimization>
4040
<CharacterSet>Unicode</CharacterSet>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4343
<ConfigurationType>Application</ConfigurationType>
4444
<UseDebugLibraries>true</UseDebugLibraries>
45-
<PlatformToolset>v142</PlatformToolset>
45+
<PlatformToolset>v143</PlatformToolset>
4646
<CharacterSet>Unicode</CharacterSet>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4949
<ConfigurationType>Application</ConfigurationType>
5050
<UseDebugLibraries>false</UseDebugLibraries>
51-
<PlatformToolset>v142</PlatformToolset>
51+
<PlatformToolset>v143</PlatformToolset>
5252
<WholeProgramOptimization>true</WholeProgramOptimization>
5353
<CharacterSet>Unicode</CharacterSet>
5454
</PropertyGroup>

‎Graphics/Docs/logo_blackbg.jpg

-62.5 KB
Binary file not shown.

‎Graphics/Docs/logo_whitebg.jpg

-62.1 KB
Binary file not shown.

‎Graphics/Docs/splash.jpg

490 KB
Loading

‎Graphics/Docs/splash2.jpg

1.65 MB
Loading

‎QuantumGateCryptoLib/QuantumGateCryptoLib.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,26 +29,26 @@
2929
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3030
<ConfigurationType>StaticLibrary</ConfigurationType>
3131
<UseDebugLibraries>true</UseDebugLibraries>
32-
<PlatformToolset>v142</PlatformToolset>
32+
<PlatformToolset>v143</PlatformToolset>
3333
<CharacterSet>Unicode</CharacterSet>
3434
</PropertyGroup>
3535
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3636
<ConfigurationType>StaticLibrary</ConfigurationType>
3737
<UseDebugLibraries>false</UseDebugLibraries>
38-
<PlatformToolset>v142</PlatformToolset>
38+
<PlatformToolset>v143</PlatformToolset>
3939
<WholeProgramOptimization>true</WholeProgramOptimization>
4040
<CharacterSet>Unicode</CharacterSet>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4343
<ConfigurationType>StaticLibrary</ConfigurationType>
4444
<UseDebugLibraries>true</UseDebugLibraries>
45-
<PlatformToolset>v142</PlatformToolset>
45+
<PlatformToolset>v143</PlatformToolset>
4646
<CharacterSet>Unicode</CharacterSet>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4949
<ConfigurationType>StaticLibrary</ConfigurationType>
5050
<UseDebugLibraries>false</UseDebugLibraries>
51-
<PlatformToolset>v142</PlatformToolset>
51+
<PlatformToolset>v143</PlatformToolset>
5252
<WholeProgramOptimization>true</WholeProgramOptimization>
5353
<CharacterSet>Unicode</CharacterSet>
5454
</PropertyGroup>

‎QuantumGateLib/API/Access.cpp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -78,49 +78,49 @@ namespace QuantumGate::API::Access
7878
return m_AccessManager->GetAllIPSubnetLimits();
7979
}
8080

81-
Result<> Manager::SetIPReputation(const IPReputation& ip_rep) noexcept
81+
Result<> Manager::SetAddressReputation(const AddressReputation& addr_rep) noexcept
8282
{
83-
return m_AccessManager->SetIPReputation(ip_rep);
83+
return m_AccessManager->SetAddressReputation(addr_rep);
8484
}
8585

86-
Result<> Manager::ResetIPReputation(const WChar* ip_str) noexcept
86+
Result<> Manager::ResetAddressReputation(const WChar* addr_str) noexcept
8787
{
88-
return m_AccessManager->ResetIPReputation(ip_str);
88+
return m_AccessManager->ResetAddressReputation(addr_str);
8989
}
9090

91-
Result<> Manager::ResetIPReputation(const String& ip_str) noexcept
91+
Result<> Manager::ResetAddressReputation(const String& addr_str) noexcept
9292
{
93-
return m_AccessManager->ResetIPReputation(ip_str.c_str());
93+
return m_AccessManager->ResetAddressReputation(addr_str.c_str());
9494
}
9595

96-
Result<> Manager::ResetIPReputation(const IPAddress& ip) noexcept
96+
Result<> Manager::ResetAddressReputation(const Address& addr) noexcept
9797
{
98-
return m_AccessManager->ResetIPReputation(ip);
98+
return m_AccessManager->ResetAddressReputation(addr);
9999
}
100100

101-
void Manager::ResetAllIPReputations() noexcept
101+
void Manager::ResetAllAddressReputations() noexcept
102102
{
103-
m_AccessManager->ResetAllIPReputations();
103+
m_AccessManager->ResetAllAddressReputations();
104104
}
105105

106-
Result<Vector<IPReputation>> Manager::GetAllIPReputations() const noexcept
106+
Result<Vector<AddressReputation>> Manager::GetAllAddressReputations() const noexcept
107107
{
108-
return m_AccessManager->GetAllIPReputations();
108+
return m_AccessManager->GetAllAddressReputations();
109109
}
110110

111-
Result<bool> Manager::GetIPAllowed(const WChar* ip_str, const CheckType check) const noexcept
111+
Result<bool> Manager::GetAddressAllowed(const WChar* addr_str, const CheckType check) const noexcept
112112
{
113-
return m_AccessManager->GetIPAllowed(ip_str, check);
113+
return m_AccessManager->GetAddressAllowed(addr_str, check);
114114
}
115115

116-
Result<bool> Manager::GetIPAllowed(const String& ip_str, const CheckType check) const noexcept
116+
Result<bool> Manager::GetAddressAllowed(const String& addr_str, const CheckType check) const noexcept
117117
{
118-
return m_AccessManager->GetIPAllowed(ip_str.c_str(), check);
118+
return m_AccessManager->GetAddressAllowed(addr_str.c_str(), check);
119119
}
120120

121-
Result<bool> Manager::GetIPAllowed(const IPAddress& ip, const CheckType check) const noexcept
121+
Result<bool> Manager::GetAddressAllowed(const Address& addr, const CheckType check) const noexcept
122122
{
123-
return m_AccessManager->GetIPAllowed(ip, check);
123+
return m_AccessManager->GetAddressAllowed(addr, check);
124124
}
125125

126126
Result<> Manager::AddPeer(PeerSettings&& pas) noexcept

‎QuantumGateLib/API/Access.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace QuantumGate::API::Access
2727
Size MaximumConnections{ 0 };
2828
};
2929

30-
struct IPReputation
30+
struct AddressReputation
3131
{
3232
struct ScoreLimits final
3333
{
@@ -36,14 +36,14 @@ namespace QuantumGate::API::Access
3636
static constexpr const Int16 Maximum{ 100 };
3737
};
3838

39-
IPAddress Address;
39+
Address Address;
4040
Int16 Score{ ScoreLimits::Minimum };
4141
std::optional<Time> LastUpdateTime;
4242
};
4343

4444
enum class CheckType : UInt16
4545
{
46-
IPFilters, IPReputations, IPSubnetLimits, All
46+
AddressReputations, IPFilters, IPSubnetLimits, All
4747
};
4848

4949
enum class PeerAccessDefault : UInt16
@@ -98,16 +98,16 @@ namespace QuantumGate::API::Access
9898

9999
Result<Vector<IPSubnetLimit>> GetAllIPSubnetLimits() const noexcept;
100100

101-
Result<> SetIPReputation(const IPReputation& ip_rep) noexcept;
102-
Result<> ResetIPReputation(const WChar* ip_str) noexcept;
103-
Result<> ResetIPReputation(const String& ip_str) noexcept;
104-
Result<> ResetIPReputation(const IPAddress& ip) noexcept;
105-
void ResetAllIPReputations() noexcept;
106-
Result<Vector<IPReputation>> GetAllIPReputations() const noexcept;
101+
Result<> SetAddressReputation(const AddressReputation& addr_rep) noexcept;
102+
Result<> ResetAddressReputation(const WChar* addr_str) noexcept;
103+
Result<> ResetAddressReputation(const String& addr_str) noexcept;
104+
Result<> ResetAddressReputation(const Address& addr) noexcept;
105+
void ResetAllAddressReputations() noexcept;
106+
Result<Vector<AddressReputation>> GetAllAddressReputations() const noexcept;
107107

108-
Result<bool> GetIPAllowed(const WChar* ip_str, const CheckType check) const noexcept;
109-
Result<bool> GetIPAllowed(const String& ip_str, const CheckType check) const noexcept;
110-
Result<bool> GetIPAllowed(const IPAddress& ip, const CheckType check) const noexcept;
108+
Result<bool> GetAddressAllowed(const WChar* addr_str, const CheckType check) const noexcept;
109+
Result<bool> GetAddressAllowed(const String& addr_str, const CheckType check) const noexcept;
110+
Result<bool> GetAddressAllowed(const Address& addr, const CheckType check) const noexcept;
111111

112112
Result<> AddPeer(PeerSettings&& pas) noexcept;
113113
Result<> UpdatePeer(PeerSettings&& pas) noexcept;

0 commit comments

Comments
 (0)