Skip to content

fix: 🐛 deal with OSX handling of IPv4 header length #1

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

Merged
dancrumb merged 1 commit into from
Nov 19, 2022
Merged

fix: 🐛 deal with OSX handling of IPv4 header length #1

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
27 changes: 27 additions & 0 deletions src/raw.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,14 @@ void SocketWrap::HandleIOEvent (int status, int revents) {
** 0.10 and 0.12. So, for now, we will just give you the number.
**/
char status_str[32];
#ifdef __APPLE__
/**
* OSX deprecates the use of sprintf
*/
snprintf(status_str, sizeof(status_str), "%d", status);
#else
sprintf(status_str, "%d", status);
#endif
args[1] = Nan::Error(status_str);

Nan::Call(Nan::New<String>("emit").ToLocalChecked(), handle(), 1, args);
Expand Down Expand Up @@ -575,6 +582,26 @@ NAN_METHOD(SocketWrap::Recv) {
uv_ip6_name (&sin6_address, addr, 50);
else
uv_ip4_name (&sin_address, addr, 50);

#ifdef __APPLE__
/*
FreeBSD has a bug/feature(?) such that:

- ip_len does not include the IP header's length. recvfrom() however
returns the packet's true length. To get the true ip_len field do:
iphdr->ip_len += iphdr->ip_hl << 2;

This code converts this information
*/
if (socket->family_ != AF_INET6) {
char *message = (char *)node::Buffer::Data(buffer);
int header_len = (message[0] & 0x0F) << 2;
long packet_len = message[3] << 8 | message[2] + header_len;

message[3] = packet_len & 0xFF;
message[2] = (packet_len >> 8) & 0xFF;
}
#endif

Local<Function> cb = Local<Function>::Cast (info[1]);
const unsigned argc = 3;
Expand Down