mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-03-03 02:06:18 +00:00
d7fd8c6952
f46e3ec0f9567a19ad9c111f264d395341327e4a net: Fix `-Wmissing-braces` (Hennadii Stepanov) Pull request description: On some non-POSIX platforms, Clang emits `-Wmissing-braces` warnings for the `IN6ADDR_ANY_INIT` and `IN6ADDR_LOOPBACK_INIT` macros. For example, on OpenIndiana / illumos: ``` $ uname -srv SunOS 5.11 illumos-325e0fc8bb $ clang --version clang version 21.1.7 (https://github.com/OpenIndiana/oi-userland.git 36a81bf5e5d307d4e85893422600678d46328010) Target: x86_64-pc-solaris2.11 Thread model: posix InstalledDir: /usr/clang/21/bin $ cmake -B build -DCMAKE_GENERATOR=Ninja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DENABLE_IPC=OFF -DAPPEND_CXXFLAGS='-Wno-unused-command-line-argument' $ cmake --build build [284/573] Building CXX object src/CMakeFiles/bitcoin_node.dir/net.cpp.o /export/home/hebasto/dev/bitcoin/src/net.cpp:3309:42: warning: suggest braces around initialization of subobject [-Wmissing-braces] 3309 | const CService ipv6_any{in6_addr(IN6ADDR_ANY_INIT), GetListenPort()}; // :: | ^~~~~~~~~~~~~~~~ /usr/include/netinet/in.h:479:32: note: expanded from macro 'IN6ADDR_ANY_INIT' 479 | #define IN6ADDR_ANY_INIT { 0, 0, 0, 0, \ | ^~~~~~~~~~~~~~~~~ 480 | 0, 0, 0, 0, \ | ~~~~~~~~~~~~~~~~~ 481 | 0, 0, 0, 0, \ | ~~~~~~~~~~~~~~~~~ 482 | 0, 0, 0, 0 } | ~~~~~~~~~~ 1 warning generated. [467/573] Building CXX object src/test/CMakeFiles/test_bitcoin.dir/i2p_tests.cpp.o /export/home/hebasto/dev/bitcoin/src/test/i2p_tests.cpp:116:34: warning: suggest braces around initialization of subobject [-Wmissing-braces] 116 | const CService addr{in6_addr(IN6ADDR_LOOPBACK_INIT), /*port=*/7656}; | ^~~~~~~~~~~~~~~~~~~~~ /usr/include/netinet/in.h:484:37: note: expanded from macro 'IN6ADDR_LOOPBACK_INIT' 484 | #define IN6ADDR_LOOPBACK_INIT { 0, 0, 0, 0, \ | ^~~~~~~~~~~~~~~~~ 485 | 0, 0, 0, 0, \ | ~~~~~~~~~~~~~~~~~ 486 | 0, 0, 0, 0, \ | ~~~~~~~~~~~~~~~~~ 487 | 0, 0, 0, 0x1U } | ~~~~~~~~~~~~~ /export/home/hebasto/dev/bitcoin/src/test/i2p_tests.cpp:159:38: warning: suggest braces around initialization of subobject [-Wmissing-braces] 159 | const CService addr{in6_addr(IN6ADDR_LOOPBACK_INIT), /*port=*/7656}; | ^~~~~~~~~~~~~~~~~~~~~ /usr/include/netinet/in.h:484:37: note: expanded from macro 'IN6ADDR_LOOPBACK_INIT' 484 | #define IN6ADDR_LOOPBACK_INIT { 0, 0, 0, 0, \ | ^~~~~~~~~~~~~~~~~ 485 | 0, 0, 0, 0, \ | ~~~~~~~~~~~~~~~~~ 486 | 0, 0, 0, 0, \ | ~~~~~~~~~~~~~~~~~ 487 | 0, 0, 0, 0x1U } | ~~~~~~~~~~~~~ 2 warnings generated. [483/573] Building CXX object src/test/CMakeFiles/test_bitcoin.dir/netbase_tests.cpp.o /export/home/hebasto/dev/bitcoin/src/test/netbase_tests.cpp:505:36: warning: suggest braces around initialization of subobject [-Wmissing-braces] 505 | CService(CNetAddr(in6_addr(IN6ADDR_LOOPBACK_INIT)), 0 /* port */), | ^~~~~~~~~~~~~~~~~~~~~ /usr/include/netinet/in.h:484:37: note: expanded from macro 'IN6ADDR_LOOPBACK_INIT' 484 | #define IN6ADDR_LOOPBACK_INIT { 0, 0, 0, 0, \ | ^~~~~~~~~~~~~~~~~ 485 | 0, 0, 0, 0, \ | ~~~~~~~~~~~~~~~~~ 486 | 0, 0, 0, 0, \ | ~~~~~~~~~~~~~~~~~ 487 | 0, 0, 0, 0x1U } | ~~~~~~~~~~~~~ /export/home/hebasto/dev/bitcoin/src/test/netbase_tests.cpp:510:36: warning: suggest braces around initialization of subobject [-Wmissing-braces] 510 | CService(CNetAddr(in6_addr(IN6ADDR_LOOPBACK_INIT)), 0x00f1 /* port */), | ^~~~~~~~~~~~~~~~~~~~~ /usr/include/netinet/in.h:484:37: note: expanded from macro 'IN6ADDR_LOOPBACK_INIT' 484 | #define IN6ADDR_LOOPBACK_INIT { 0, 0, 0, 0, \ | ^~~~~~~~~~~~~~~~~ 485 | 0, 0, 0, 0, \ | ~~~~~~~~~~~~~~~~~ 486 | 0, 0, 0, 0, \ | ~~~~~~~~~~~~~~~~~ 487 | 0, 0, 0, 0x1U } | ~~~~~~~~~~~~~ /export/home/hebasto/dev/bitcoin/src/test/netbase_tests.cpp:515:36: warning: suggest braces around initialization of subobject [-Wmissing-braces] 515 | CService(CNetAddr(in6_addr(IN6ADDR_LOOPBACK_INIT)), 0xf1f2 /* port */), | ^~~~~~~~~~~~~~~~~~~~~ /usr/include/netinet/in.h:484:37: note: expanded from macro 'IN6ADDR_LOOPBACK_INIT' 484 | #define IN6ADDR_LOOPBACK_INIT { 0, 0, 0, 0, \ | ^~~~~~~~~~~~~~~~~ 485 | 0, 0, 0, 0, \ | ~~~~~~~~~~~~~~~~~ 486 | 0, 0, 0, 0, \ | ~~~~~~~~~~~~~~~~~ 487 | 0, 0, 0, 0x1U } | ~~~~~~~~~~~~~ 3 warnings generated. [573/573] Linking CXX executable bin/test_bitcoin ``` The same issue is observed on Windows. For further details, see https://github.com/bitcoin/bitcoin/pull/31507. ACKs for top commit: bensig: ACK f46e3ec0f9567a19ad9c111f264d395341327e4a maflcko: review ACK f46e3ec0f9567a19ad9c111f264d395341327e4a 👭 vasild: ACK f46e3ec0f9567a19ad9c111f264d395341327e4a sedited: utACK f46e3ec0f9567a19ad9c111f264d395341327e4a Tree-SHA512: 9ad597d393ba04537b3aa728070ea7bbe1fc8796f6d8f3d90eb511242e5a61b0ab18123a6be3cca89aaa20ba7fb4dbe682c4d1c6bd3f6d883c459133e0c2861f
119 lines
4.0 KiB
C++
119 lines
4.0 KiB
C++
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
|
// Copyright (c) 2009-present The Bitcoin Core developers
|
|
// Distributed under the MIT software license, see the accompanying
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
#ifndef BITCOIN_COMPAT_COMPAT_H
|
|
#define BITCOIN_COMPAT_COMPAT_H
|
|
|
|
// Windows defines FD_SETSIZE to 64 (see _fd_types.h in mingw-w64),
|
|
// which is too small for our usage, but allows us to redefine it safely.
|
|
// We redefine it to be 1024, to match glibc, see typesizes.h.
|
|
#ifdef WIN32
|
|
#ifdef FD_SETSIZE
|
|
#undef FD_SETSIZE
|
|
#endif
|
|
#define FD_SETSIZE 1024
|
|
#include <winsock2.h>
|
|
#include <ws2tcpip.h>
|
|
#include <cstdint>
|
|
#else
|
|
#include <arpa/inet.h> // IWYU pragma: export
|
|
#include <fcntl.h> // IWYU pragma: export
|
|
#include <net/if.h> // IWYU pragma: export
|
|
#include <netdb.h> // IWYU pragma: export
|
|
#include <netinet/in.h> // IWYU pragma: export
|
|
#include <netinet/tcp.h> // IWYU pragma: export
|
|
#include <sys/mman.h> // IWYU pragma: export
|
|
#include <sys/select.h> // IWYU pragma: export
|
|
#include <sys/socket.h> // IWYU pragma: export
|
|
#include <sys/types.h> // IWYU pragma: export
|
|
#include <unistd.h> // IWYU pragma: export
|
|
#endif
|
|
|
|
// Windows does not have `sa_family_t` - it defines `sockaddr::sa_family` as `u_short`.
|
|
// Thus define `sa_family_t` on Windows too so that the rest of the code can use `sa_family_t`.
|
|
// See https://learn.microsoft.com/en-us/windows/win32/api/winsock/ns-winsock-sockaddr#syntax
|
|
#ifdef WIN32
|
|
typedef u_short sa_family_t;
|
|
#endif
|
|
|
|
// Brace style in the IN6ADDR_*_INIT macros differs across platforms.
|
|
#if defined(__illumos__)
|
|
#define COMPAT_IN6ADDR_ANY_INIT {{IN6ADDR_ANY_INIT}}
|
|
#else
|
|
#define COMPAT_IN6ADDR_ANY_INIT IN6ADDR_ANY_INIT
|
|
#endif
|
|
#if defined(__illumos__) || defined(_MSC_VER)
|
|
#define COMPAT_IN6ADDR_LOOPBACK_INIT {{IN6ADDR_LOOPBACK_INIT}}
|
|
#else
|
|
#define COMPAT_IN6ADDR_LOOPBACK_INIT IN6ADDR_LOOPBACK_INIT
|
|
#endif
|
|
|
|
// We map Linux / BSD error functions and codes, to the equivalent
|
|
// Windows definitions, and use the WSA* names throughout our code.
|
|
// Note that glibc defines EWOULDBLOCK as EAGAIN (see errno.h).
|
|
#ifndef WIN32
|
|
typedef unsigned int SOCKET;
|
|
#include <cerrno>
|
|
#define WSAGetLastError() errno
|
|
#define WSAEINVAL EINVAL
|
|
#define WSAEWOULDBLOCK EWOULDBLOCK
|
|
#define WSAEAGAIN EAGAIN
|
|
#define WSAEMSGSIZE EMSGSIZE
|
|
#define WSAEINTR EINTR
|
|
#define WSAEINPROGRESS EINPROGRESS
|
|
#define WSAEADDRINUSE EADDRINUSE
|
|
#define INVALID_SOCKET (SOCKET)(~0)
|
|
#define SOCKET_ERROR -1
|
|
#else
|
|
// WSAEAGAIN doesn't exist on Windows
|
|
#ifdef EAGAIN
|
|
#define WSAEAGAIN EAGAIN
|
|
#else
|
|
#define WSAEAGAIN WSAEWOULDBLOCK
|
|
#endif
|
|
#endif
|
|
|
|
// Windows defines MAX_PATH as it's maximum path length.
|
|
// We define MAX_PATH for use on non-Windows systems.
|
|
#ifndef WIN32
|
|
#define MAX_PATH 1024
|
|
#endif
|
|
|
|
// ssize_t is POSIX, and not present when using MSVC.
|
|
#ifdef _MSC_VER
|
|
#include <BaseTsd.h>
|
|
typedef SSIZE_T ssize_t;
|
|
#endif
|
|
|
|
#ifdef WIN32
|
|
// Export main() and ensure working ASLR when using mingw-w64.
|
|
// Exporting a symbol will prevent the linker from stripping
|
|
// the .reloc section from the binary, which is a requirement
|
|
// for ASLR. While release builds are not affected, anyone
|
|
// building with a binutils < 2.36 is subject to this ld bug.
|
|
#define MAIN_FUNCTION __declspec(dllexport) int main(int argc, char* argv[])
|
|
#else
|
|
#define MAIN_FUNCTION int main(int argc, char* argv[])
|
|
#endif
|
|
|
|
// Note these both should work with the current usage of poll, but best to be safe
|
|
// WIN32 poll is broken https://daniel.haxx.se/blog/2012/10/10/wsapoll-is-broken/
|
|
// __APPLE__ poll is broke https://github.com/bitcoin/bitcoin/pull/14336#issuecomment-437384408
|
|
#if defined(__linux__)
|
|
#define USE_POLL
|
|
#endif
|
|
|
|
// MSG_NOSIGNAL is not available on some platforms, if it doesn't exist define it as 0
|
|
#if !defined(MSG_NOSIGNAL)
|
|
#define MSG_NOSIGNAL 0
|
|
#endif
|
|
|
|
// MSG_DONTWAIT is not available on some platforms, if it doesn't exist define it as 0
|
|
#if !defined(MSG_DONTWAIT)
|
|
#define MSG_DONTWAIT 0
|
|
#endif
|
|
|
|
#endif // BITCOIN_COMPAT_COMPAT_H
|