From 64078ee051029a3b94e2b36beb52eb33febc9c56 Mon Sep 17 00:00:00 2001 From: Ludvig Strigeus Date: Tue, 11 Sep 2018 00:21:26 +0200 Subject: [PATCH] Missing ; and wrong name in threading lock macros --- wireguard.cpp | 10 +++++----- wireguard_proto.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wireguard.cpp b/wireguard.cpp index 9209411..ceeb068 100644 --- a/wireguard.cpp +++ b/wireguard.cpp @@ -288,7 +288,7 @@ bool WireguardProcessor::HandleIcmpv6NeighborSolicitation(const byte *data, size // Target address must match a peer's range. WG_ACQUIRE_RWLOCK_SHARED(dev_.ip_to_peer_map_lock_); WgPeer *peer = (WgPeer*)dev_.ip_to_peer_map().LookupV6(data + 48); - WG_RELEASE_RWLOCK_SHARED(dev_.ip_to_peer_map_lock_) + WG_RELEASE_RWLOCK_SHARED(dev_.ip_to_peer_map_lock_); if (peer == NULL) return false; @@ -351,7 +351,7 @@ void WireguardProcessor::HandleTunPacket(Packet *packet) { uint32 ip = ReadBE32(data + 16); WG_ACQUIRE_RWLOCK_SHARED(dev_.ip_to_peer_map_lock_); peer = (WgPeer*)dev_.ip_to_peer_map().LookupV4(ip); - WG_RELEASE_RWLOCK_SHARED(dev_.ip_to_peer_map_lock_) + WG_RELEASE_RWLOCK_SHARED(dev_.ip_to_peer_map_lock_); if (peer == NULL) goto getout; if ((ip >= (224 << 24) || ip == peer->ipv4_broadcast_addr_) && !peer->allow_multicast_through_peer_) @@ -371,7 +371,7 @@ void WireguardProcessor::HandleTunPacket(Packet *packet) { WG_ACQUIRE_RWLOCK_SHARED(dev_.ip_to_peer_map_lock_); peer = (WgPeer*)dev_.ip_to_peer_map().LookupV6(data + 24); - WG_RELEASE_RWLOCK_SHARED(dev_.ip_to_peer_map_lock_) + WG_RELEASE_RWLOCK_SHARED(dev_.ip_to_peer_map_lock_); if (peer == NULL) goto getout; @@ -929,7 +929,7 @@ void WireguardProcessor::HandleAuthenticatedDataPacket_WillUnlock(WgKeypair *key goto getout_error_header; WG_ACQUIRE_RWLOCK_SHARED(dev_.ip_to_peer_map_lock_); peer_from_header = (WgPeer*)dev_.ip_to_peer_map().LookupV4(ReadBE32(data + 12)); - WG_RELEASE_RWLOCK_SHARED(dev_.ip_to_peer_map_lock_) + WG_RELEASE_RWLOCK_SHARED(dev_.ip_to_peer_map_lock_); size_from_header = ReadBE16(data + 2); if (size_from_header < IPV4_HEADER_SIZE) { // too small packet? @@ -940,7 +940,7 @@ void WireguardProcessor::HandleAuthenticatedDataPacket_WillUnlock(WgKeypair *key goto getout_error_header; WG_ACQUIRE_RWLOCK_SHARED(dev_.ip_to_peer_map_lock_); peer_from_header = (WgPeer*)dev_.ip_to_peer_map().LookupV6(data + 8); - WG_RELEASE_RWLOCK_SHARED(dev_.ip_to_peer_map_lock_) + WG_RELEASE_RWLOCK_SHARED(dev_.ip_to_peer_map_lock_); size_from_header = IPV6_HEADER_SIZE + ReadBE16(data + 4); } else { // invalid ip version diff --git a/wireguard_proto.h b/wireguard_proto.h index 9dc7406..36f7b51 100644 --- a/wireguard_proto.h +++ b/wireguard_proto.h @@ -14,7 +14,7 @@ // Threading macros that enable locks only in MT builds #if WITH_WG_THREADING -#define WG_SCOPED_LOCK(name) AutoLock scoped_lock(&name) +#define WG_SCOPED_LOCK(name) ScopedLock scoped_lock(&name) #define WG_ACQUIRE_LOCK(name) name.Acquire() #define WG_RELEASE_LOCK(name) name.Release() #define WG_DECLARE_LOCK(name) Mutex name;