diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2025-10-17 10:21:22 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2025-10-21 16:56:18 -0700 |
| commit | 6ec878ccab1b86b46f9dff8d42677f7b260110b2 (patch) | |
| tree | 394f2867878418c9a87584765007f12ea8040df9 /src/network/socket/qnativesocketengine_unix.cpp | |
| parent | aaf908e3cf90cab8e203b7343e9e3dbd150c243f (diff) | |
QNativeSocketEngine/Unix: detect sockaddr_dl with AF_LINK
Instead of by proxy trying to guess that BSD systems have it and others
don't. That's an incorrect assumption because QNX has this and
IP_RECVIF, but isn't marked a Q_OS_BSD4.
FreeBSD says sockaddr_dl should have .sdl_family = AF_LINK:
http://fxr.watson.org/fxr/source/net/if_dl.h
Change-Id: Ibe2777515c0f71285783fffd5c0094f622de34a9
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/network/socket/qnativesocketengine_unix.cpp')
| -rw-r--r-- | src/network/socket/qnativesocketengine_unix.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp index 885af248ea7..430197ccc6e 100644 --- a/src/network/socket/qnativesocketengine_unix.cpp +++ b/src/network/socket/qnativesocketengine_unix.cpp @@ -33,7 +33,7 @@ #include <sys/socket.h> #include <netinet/sctp.h> #endif -#ifdef Q_OS_BSD4 +#ifdef AF_LINK # include <net/if_dl.h> #endif @@ -923,7 +923,7 @@ qint64 QNativeSocketEnginePrivate::nativeReceiveDatagram(char *data, qint64 maxS { // we use quintptr to force the alignment quintptr cbuf[(CMSG_SPACE(sizeof(struct in6_pktinfo)) + CMSG_SPACE(sizeof(int)) -#if !defined(IP_PKTINFO) && defined(IP_RECVIF) && defined(Q_OS_BSD4) +#if !defined(IP_PKTINFO) && defined(IP_RECVIF) && defined(AF_LINK) + CMSG_SPACE(sizeof(sockaddr_dl)) #endif #ifndef QT_NO_SCTP @@ -1015,7 +1015,7 @@ qint64 QNativeSocketEnginePrivate::nativeReceiveDatagram(char *data, qint64 maxS header->destinationAddress.setAddress(ntohl(addr->s_addr)); } # endif -# if defined(IP_RECVIF) && defined(Q_OS_BSD4) +# if defined(IP_RECVIF) && defined(AF_LINK) if (cmsgptr->cmsg_level == IPPROTO_IP && cmsgptr->cmsg_type == IP_RECVIF && cmsgptr->cmsg_len >= CMSG_LEN(sizeof(sockaddr_dl))) { sockaddr_dl *sdl = reinterpret_cast<sockaddr_dl *>(CMSG_DATA(cmsgptr)); |