Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

network/stack: Fix handling of MSG_TRUNC in socket_receive.

Browse Source 
This is a Linux extension (which at least FreeBSD has also
adopted.) It's used in the Haiku port of libpcap (where it's
a necessity) and wpa_supplicant (where it wasn't, and I
removed it.) It seems that we've had it for quite some time.

Fixes tcpdump following addition of flag checks.
This commit is contained in:
Augustin Cavalier 2023-11-24 23:07:18 -05:00
parent e91af56d9f
commit 2926dfaa3f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/add-ons/kernel/network/stack/net_socket.cpp
View File

@ -1170,6 +1170,8 @@ socket_receive(net_socket* socket, msghdr* header, void* data, size_t length,
if (socket->first_info->read_data_no_buffer != NULL)
return socket_receive_no_buffer(socket, header, data, length, flags);
const int originalFlags = flags;
flags &= ~MSG_TRUNC;
size_t totalLength = length;
net_buffer* buffer;
int i;
@ -1260,7 +1262,7 @@ socket_receive(net_socket* socket, msghdr* header, void* data, size_t length,
if (header)
header->msg_flags = MSG_TRUNC;
if (flags & MSG_TRUNC)
if ((originalFlags & MSG_TRUNC) != 0)
return bytesReceived;
}