Some small style fixes
This commit is contained in:
parent
6e09191bf5
commit
60366386ca
4
stdafx.h
4
stdafx.h
|
@ -15,12 +15,12 @@
|
||||||
#define _WINSOCK_DEPRECATED_NO_WARNINGS 1
|
#define _WINSOCK_DEPRECATED_NO_WARNINGS 1
|
||||||
#define _HAS_EXCEPTIONS 0
|
#define _HAS_EXCEPTIONS 0
|
||||||
#define _CRT_SECURE_NO_WARNINGS 1
|
#define _CRT_SECURE_NO_WARNINGS 1
|
||||||
|
#define NOMINMAX
|
||||||
|
|
||||||
//#include <Winsock2.h>
|
//#include <Winsock2.h>
|
||||||
#include <Ws2tcpip.h>
|
#include <Ws2tcpip.h>
|
||||||
|
|
||||||
#include <Windows.h>
|
#include <Windows.h>
|
||||||
#undef max
|
|
||||||
//#include <winsock2.h>
|
//#include <winsock2.h>
|
||||||
#include <ws2ipdef.h>
|
#include <ws2ipdef.h>
|
||||||
#include <iphlpapi.h>
|
#include <iphlpapi.h>
|
||||||
|
@ -38,5 +38,3 @@
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#undef min
|
|
||||||
|
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
union IpAddr {
|
union IpAddr {
|
||||||
|
short int sin_family;
|
||||||
sockaddr_in sin;
|
sockaddr_in sin;
|
||||||
sockaddr_in6 sin6;
|
sockaddr_in6 sin6;
|
||||||
};
|
};
|
||||||
|
|
|
@ -402,7 +402,7 @@ void WgConfig::HandleConfigurationProtocolGet(WireguardProcessor *proc, std::str
|
||||||
CmsgAppendFmt(result, "address=%s", PrintWgCidrAddr(x, buf));
|
CmsgAppendFmt(result, "address=%s", PrintWgCidrAddr(x, buf));
|
||||||
|
|
||||||
for (WgPeer *peer = proc->dev_.peers_; peer; peer = peer->next_peer_) {
|
for (WgPeer *peer = proc->dev_.peers_; peer; peer = peer->next_peer_) {
|
||||||
WG_SCOPED_LOCK(peer->lock_);
|
WG_SCOPED_LOCK(peer->mutex_);
|
||||||
|
|
||||||
CmsgAppendHex(result, "public_key", peer->s_remote_.bytes, sizeof(peer->s_remote_));
|
CmsgAppendHex(result, "public_key", peer->s_remote_.bytes, sizeof(peer->s_remote_));
|
||||||
if (!IsOnlyZeros(peer->preshared_key_, sizeof(peer->preshared_key_)))
|
if (!IsOnlyZeros(peer->preshared_key_, sizeof(peer->preshared_key_)))
|
||||||
|
|
|
@ -927,8 +927,8 @@ bool WgPeer::ParseExtendedHandshake(WgKeypair *kp, const uint8 *data, size_t dat
|
||||||
|
|
||||||
case EXT_BOOLEAN_FEATURES:
|
case EXT_BOOLEAN_FEATURES:
|
||||||
if (WITH_BOOLEAN_FEATURES) {
|
if (WITH_BOOLEAN_FEATURES) {
|
||||||
for (size_t i = 0, j = std::max<uint32>(WG_FEATURES_COUNT, size * 4); i != j; i++) {
|
for (uint32 i = 0, j = std::max<uint32>(WG_FEATURES_COUNT, size * 4); i != j; i++) {
|
||||||
uint8 value = (i < size * 4) ? (data[i >> 2] >> ((i * 2) & 7)) & 3 : 0;
|
uint8 value = (i < (uint32)size * 4) ? (data[i >> 2] >> ((i * 2) & 7)) & 3 : 0;
|
||||||
if (i >= WG_FEATURES_COUNT ? (value == WG_BOOLEAN_FEATURE_ENFORCES) :
|
if (i >= WG_FEATURES_COUNT ? (value == WG_BOOLEAN_FEATURE_ENFORCES) :
|
||||||
!ResolveBooleanFeatureValue(value, features_[i], &kp->enabled_features[i]))
|
!ResolveBooleanFeatureValue(value, features_[i], &kp->enabled_features[i]))
|
||||||
return false;
|
return false;
|
||||||
|
|
Loading…
Reference in a new issue