askiiart/tunsafe-clang15
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Some small style fixes

Browse source
This commit is contained in:
Ludvig Strigeus 2018-12-10 23:31:47 +01:00
parent 6e09191bf5
commit 60366386ca
5 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
stdafx.h
View file

@ -15,12 +15,12 @@
#define _WINSOCK_DEPRECATED_NO_WARNINGS 1
#define _HAS_EXCEPTIONS 0
#define _CRT_SECURE_NO_WARNINGS 1
#define NOMINMAX
//#include <Winsock2.h>
#include <Ws2tcpip.h>
#include <Windows.h>
#undef max
//#include <winsock2.h>
#include <ws2ipdef.h>
#include <iphlpapi.h>
@ -38,5 +38,3 @@
#include <vector>
#include <string>
#undef min

1
tunsafe_ipaddr.h
View file

@ -11,6 +11,7 @@
#endif
union IpAddr {
short int sin_family;
sockaddr_in sin;
sockaddr_in6 sin6;
};

2
wireguard.cpp
View file

@ -488,7 +488,7 @@ add_padding:
inner_tag = WG_ACK_HEADER_COUNTER_4;
} else {
WriteLE32(write -= 4, (uint32)next_expected_packet);
WriteLE16(write -= 2, (uint16)(next_expected_packet>>32));
WriteLE16(write -= 2, (uint16)(next_expected_packet >> 32));
inner_tag = WG_ACK_HEADER_COUNTER_6;
}
if (keypair->broadcast_short_key != 0) {

2
wireguard_config.cpp
View file

@ -402,7 +402,7 @@ void WgConfig::HandleConfigurationProtocolGet(WireguardProcessor *proc, std::str
CmsgAppendFmt(result, "address=%s", PrintWgCidrAddr(x, buf));
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_));
if (!IsOnlyZeros(peer->preshared_key_, sizeof(peer->preshared_key_)))

4
wireguard_proto.cpp
View file

@ -927,8 +927,8 @@ bool WgPeer::ParseExtendedHandshake(WgKeypair *kp, const uint8 *data, size_t dat
case EXT_BOOLEAN_FEATURES:
if (WITH_BOOLEAN_FEATURES) {
for (size_t 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;
for (uint32 i = 0, j = std::max<uint32>(WG_FEATURES_COUNT, size * 4); i != j; i++) {
uint8 value = (i < (uint32)size * 4) ? (data[i >> 2] >> ((i * 2) & 7)) & 3 : 0;
if (i >= WG_FEATURES_COUNT ? (value == WG_BOOLEAN_FEATURE_ENFORCES) :
!ResolveBooleanFeatureValue(value, features_[i], &kp->enabled_features[i]))
return false;