vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: restore qnativesocketengine_unix.cpp from tarball (remove broken include)

Browse Source 
The committed git state had a broken #include from a concurrent session.
The atomic build extracts the clean tarball, but the dirty git-tracked
file was never committed clean. Reverted to tarball version.
This commit is contained in:
Vasilito
2026-05-06 18:10:57 +01:00
parent 40c337cbac
commit 0a082bb6eb
1 changed files with 0 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
local/recipes/qt/qtbase/source/src/network/socket/qnativesocketengine_unix.cpp
-34
View File
@@ -148,9 +148,7 @@ static void convertToLevelAndOption(QNativeSocketEngine::SocketOption opt,
case QNativeSocketEngine::ReceiveHopLimit: case QNativeSocketEngine::ReceiveHopLimit:
if (socketProtocol == QAbstractSocket::IPv6Protocol || socketProtocol == QAbstractSocket::AnyIPProtocol) { if (socketProtocol == QAbstractSocket::IPv6Protocol || socketProtocol == QAbstractSocket::AnyIPProtocol) {
level = IPPROTO_IPV6; level = IPPROTO_IPV6;
#ifdef IPV6_RECVHOPLIMIT
n = IPV6_RECVHOPLIMIT; n = IPV6_RECVHOPLIMIT;
#endif
} else if (socketProtocol == QAbstractSocket::IPv4Protocol) { } else if (socketProtocol == QAbstractSocket::IPv4Protocol) {
#ifdef IP_RECVTTL // IP_RECVTTL is a non-standard extension supported on some OS #ifdef IP_RECVTTL // IP_RECVTTL is a non-standard extension supported on some OS
level = IPPROTO_IP; level = IPPROTO_IP;
@@ -1060,12 +1058,8 @@ qint64 QNativeSocketEnginePrivate::nativeReceiveDatagram(char *data, qint64 maxS
#endif #endif
if (cmsgptr->cmsg_len == CMSG_LEN(sizeof(int)) if (cmsgptr->cmsg_len == CMSG_LEN(sizeof(int))
#ifdef IPV6_HOPLIMIT
&& ((cmsgptr->cmsg_level == IPPROTO_IPV6 && cmsgptr->cmsg_type == IPV6_HOPLIMIT) && ((cmsgptr->cmsg_level == IPPROTO_IPV6 && cmsgptr->cmsg_type == IPV6_HOPLIMIT)
|| (cmsgptr->cmsg_level == IPPROTO_IP && cmsgptr->cmsg_type == IP_TTL))) { || (cmsgptr->cmsg_level == IPPROTO_IP && cmsgptr->cmsg_type == IP_TTL))) {
#else
&& (cmsgptr->cmsg_level == IPPROTO_IP && cmsgptr->cmsg_type == IP_TTL)) {
#endif
static_assert(sizeof(header->hopLimit) == sizeof(int)); static_assert(sizeof(header->hopLimit) == sizeof(int));
memcpy(&header->hopLimit, CMSG_DATA(cmsgptr), sizeof(header->hopLimit)); memcpy(&header->hopLimit, CMSG_DATA(cmsgptr), sizeof(header->hopLimit));
} }
@@ -1122,20 +1116,6 @@ qint64 QNativeSocketEnginePrivate::nativeSendDatagram(const char *data, qint64 l
} }
if (msg.msg_namelen == sizeof(aa.a6)) { if (msg.msg_namelen == sizeof(aa.a6)) {
#ifdef IPV6_HOPLIMIT
#ifdef IPV6_HOPLIMIT
#ifdef IPV6_HOPLIMIT
#ifdef IPV6_HOPLIMIT
#ifdef IPV6_HOPLIMIT
#ifdef IPV6_HOPLIMIT
#ifdef IPV6_HOPLIMIT
#ifdef IPV6_HOPLIMIT
#ifdef IPV6_HOPLIMIT
#ifdef IPV6_HOPLIMIT
#ifdef IPV6_HOPLIMIT
#ifdef IPV6_HOPLIMIT
#ifdef IPV6_HOPLIMIT
#ifdef IPV6_HOPLIMIT
if (header.hopLimit != -1) { if (header.hopLimit != -1) {
msg.msg_controllen += CMSG_SPACE(sizeof(int)); msg.msg_controllen += CMSG_SPACE(sizeof(int));
cmsgptr->cmsg_len = CMSG_LEN(sizeof(int)); cmsgptr->cmsg_len = CMSG_LEN(sizeof(int));
@@ -1144,20 +1124,6 @@ qint64 QNativeSocketEnginePrivate::nativeSendDatagram(const char *data, qint64 l
memcpy(CMSG_DATA(cmsgptr), &header.hopLimit, sizeof(int)); memcpy(CMSG_DATA(cmsgptr), &header.hopLimit, sizeof(int));
cmsgptr = reinterpret_cast<cmsghdr *>(reinterpret_cast<char *>(cmsgptr) + CMSG_SPACE(sizeof(int))); cmsgptr = reinterpret_cast<cmsghdr *>(reinterpret_cast<char *>(cmsgptr) + CMSG_SPACE(sizeof(int)));
} }
#endif
#endif
#endif
#endif
#endif
#endif
#endif
#endif
#endif
#endif
#endif
#endif
#endif
#endif
if (header.ifindex != 0 || !header.senderAddress.isNull()) { if (header.ifindex != 0 || !header.senderAddress.isNull()) {
struct in6_pktinfo *data = reinterpret_cast<in6_pktinfo *>(CMSG_DATA(cmsgptr)); struct in6_pktinfo *data = reinterpret_cast<in6_pktinfo *>(CMSG_DATA(cmsgptr));
memset(data, 0, sizeof(*data)); memset(data, 0, sizeof(*data));