Skip to content

Add setting of sin_len/sin6_len for BSD and macOS #3765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
softins wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −2
Open

Add setting of sin_len/sin6_len for BSD and macOS #3765

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions src/socket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,12 @@ void CSocket::Init ( const quint16 iNewPortNumber, const quint16 iNewQosNumber,
}
#endif

UdpSocketAddrLen = sizeof ( UdpSocketAddr.sa6 );
#ifdef Q_OS_BSD4
UdpSocketAddr.sa6.sin6_len = UdpSocketAddrLen;
#endif
UdpSocketAddr.sa6.sin6_family = AF_INET6;
UdpSocketAddr.sa6.sin6_addr = in6addr_any;
UdpSocketAddrLen = sizeof ( UdpSocketAddr.sa6 );

UdpPort = &UdpSocketAddr.sa6.sin6_port; // where to put the port number

Expand Down Expand Up @@ -206,9 +209,12 @@ void CSocket::Init ( const quint16 iNewPortNumber, const quint16 iNewQosNumber,
#endif

// preinitialize socket in address (only the port number is missing)
UdpSocketAddrLen = sizeof ( UdpSocketAddr.sa4 );
#ifdef Q_OS_BSD4
UdpSocketAddr.sa4.sin_len = UdpSocketAddrLen;
#endif
UdpSocketAddr.sa4.sin_family = AF_INET;
UdpSocketAddr.sa4.sin_addr.s_addr = INADDR_ANY;
UdpSocketAddrLen = sizeof ( UdpSocketAddr.sa4 );

UdpPort = &UdpSocketAddr.sa4.sin_port; // where to put the port number

Expand Down Expand Up @@ -391,6 +397,9 @@ void CSocket::SendPacket ( const CVector<uint8_t>& vecbySendBuf, const CHostAddr
// but Windows does not. So use a V4MAPPED address in an AF_INET6 sockaddr,
// which works on all platforms.

#ifdef Q_OS_BSD4
UdpSocketAddr.sa6.sin6_len = sizeof ( UdpSocketAddr.sa6 );
#endif
UdpSocketAddr.sa6.sin6_family = AF_INET6;
UdpSocketAddr.sa6.sin6_port = htons ( HostAddr.iPort );

Expand Down Expand Up @@ -421,6 +430,9 @@ void CSocket::SendPacket ( const CVector<uint8_t>& vecbySendBuf, const CHostAddr
}
else
{
#ifdef Q_OS_BSD4
UdpSocketAddr.sa4.sin_len = sizeof ( UdpSocketAddr.sa4 );
#endif
UdpSocketAddr.sa4.sin_family = AF_INET;
UdpSocketAddr.sa4.sin_port = htons ( HostAddr.iPort );
UdpSocketAddr.sa4.sin_addr.s_addr = htonl ( HostAddr.InetAddr.toIPv4Address() );
Expand All @@ -435,6 +447,9 @@ void CSocket::SendPacket ( const CVector<uint8_t>& vecbySendBuf, const CHostAddr
}
else if ( bIPv6Available )
{
#ifdef Q_OS_BSD4
UdpSocketAddr.sa6.sin6_len = sizeof ( UdpSocketAddr.sa6 );
#endif
UdpSocketAddr.sa6.sin6_family = AF_INET6;
UdpSocketAddr.sa6.sin6_port = htons ( HostAddr.iPort );
inet_pton ( AF_INET6, HostAddr.InetAddr.toString().toLocal8Bit().constData(), &UdpSocketAddr.sa6.sin6_addr );
Expand Down
Loading