From fd857ef77132eab244564ae34b1f56b962227952 Mon Sep 17 00:00:00 2001 From: Lukas Werling Date: Tue, 10 Jan 2017 18:27:21 +0100 Subject: [PATCH] Improve "unexpected address family" asserts --- src/netpuncher/C4PuncherHash.h | 3 ++- src/network/C4Network2.cpp | 4 +++- src/network/C4Network2IO.cpp | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/netpuncher/C4PuncherHash.h b/src/netpuncher/C4PuncherHash.h index c8357945c..0c003521b 100644 --- a/src/netpuncher/C4PuncherHash.h +++ b/src/netpuncher/C4PuncherHash.h @@ -76,7 +76,8 @@ namespace std { auto unpack = make_tuple(v6.sin6_family, v6.sin6_port, v6.sin6_flowinfo, std::string((char*) v6.sin6_addr.s6_addr, 16), v6.sin6_scope_id); return hash()(unpack); } - default: + case C4NetIO::HostAddress::UnknownFamily: + assert(!"Unexpected address family"); return 0; } } diff --git a/src/network/C4Network2.cpp b/src/network/C4Network2.cpp index 8bbf99150..9c7a3689b 100644 --- a/src/network/C4Network2.cpp +++ b/src/network/C4Network2.cpp @@ -948,8 +948,10 @@ C4NetpuncherID::value& C4Network2::getNetpuncherGameID(C4NetIO::HostAddress::Add { case C4NetIO::HostAddress::IPv4: return NetpuncherGameID.v4; case C4NetIO::HostAddress::IPv6: return NetpuncherGameID.v6; - default: assert(false); + case C4NetIO::HostAddress::UnknownFamily: assert(!"Unexpected address family"); } + // We need to return a valid reference to satisfy the compiler, even though the code here is unreachable. + return NetpuncherGameID.v4; } void C4Network2::InitPuncher() diff --git a/src/network/C4Network2IO.cpp b/src/network/C4Network2IO.cpp index 86aa54005..d421051f0 100644 --- a/src/network/C4Network2IO.cpp +++ b/src/network/C4Network2IO.cpp @@ -468,8 +468,8 @@ bool C4Network2IO::InitPuncher(C4NetIO::addr_t nPuncherAddr) case C4NetIO::HostAddress::IPv6: PuncherAddrIPv6 = nPuncherAddr; break; - default: - assert(false); + case C4NetIO::HostAddress::UnknownFamily: + assert(!"Unexpected address family"); } // let's punch return pNetIO_UDP->Connect(nPuncherAddr);