RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 16:47:36 +00:00
Code Issues Activity Actions

Kernel: Fix a bad printf, and stub out SO_ERROR a bit more fully

Browse source 
links requests SO_ERROR, so in not supporting it, things were unhappy.
Supporting this properly looks a little messy. I guess Socket will need
an m_error member it sets everywhere it returns an error. Or Syscall
could set it, perhaps, but I don't know if that's the right thing to
do, so let's just stub this for now and file a bug.
This commit is contained in:
Robin Burchell 2019-05-29 21:59:50 +02:00 • committed by Andreas Kling
parent 3ffb2ad4e0
commit a906098579
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Kernel/Net/Socket.cpp
View file

@ -97,8 +97,15 @@ KResult Socket::getsockopt(int level, int option, void* value, socklen_t* value_
*(timeval*)value = m_receive_timeout; *(timeval*)value = m_receive_timeout;
*value_size = sizeof(timeval); *value_size = sizeof(timeval);
return KSuccess; return KSuccess;
case SO_ERROR:
if (*value_size < sizeof(int))
return KResult(-EINVAL);
kprintf("%s(%u): getsockopt() SO_ERROR: WARNING! I have no idea what the real error is, so I'll just stick my fingers in my ears and pretend there is none! %d\n", current->process().name().characters(), option);
*(int*)value = 0;
*value_size = sizeof(int);
return KSuccess;
default: default:
kprintf("%s(%u): getsockopt() at SOL_SOCKET with unimplemented option %d\n", option); kprintf("%s(%u): getsockopt() at SOL_SOCKET with unimplemented option %d\n", current->process().name().characters(), option);
return KResult(-ENOPROTOOPT); return KResult(-ENOPROTOOPT);
} }
} }

2
Kernel/UnixTypes.h
View file

@ -335,6 +335,8 @@ struct pollfd {
#define SO_RCVTIMEO 1 #define SO_RCVTIMEO 1
#define SO_SNDTIMEO 2 #define SO_SNDTIMEO 2
#define SO_KEEPALIVE 3
#define SO_ERROR 4
#define IPPROTO_ICMP 1 #define IPPROTO_ICMP 1
#define IPPROTO_TCP 6 #define IPPROTO_TCP 6