squiid/mlibc
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

sysdeps/managarm: Fix a bug in sys_gethostname

Browse source 
sysdeps/managarm: Convert sys_getpeername to helix_ng

Signed-off-by: Dennisbonke <admin@dennisbonke.com>
This commit is contained in:
Dennisbonke 2020-07-28 00:23:32 +02:00 committed by Kacper Słomiński
parent 9ac299a5eb
commit 7d7641697f
2 changed files with 21 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sysdeps/managarm/generic/file.cpp
View file

@ -4103,7 +4103,7 @@ int sys_gethostname(char *buffer, size_t bufsize) {
char name[10] = "managarm\0";
if(bufsize < 10)
return ENAMETOOLONG;
buffer = name;
strncpy(buffer, name, 10);
return 0;
}

49
sysdeps/managarm/generic/socket.cpp
View file

@ -185,8 +185,6 @@ int sys_sockname(int fd, struct sockaddr *addr_ptr, socklen_t max_addr_length,
int sys_peername(int fd, struct sockaddr *addr_ptr, socklen_t max_addr_length,
socklen_t *actual_length) {
SignalGuard sguard;
HelAction actions[4];
globalQueue.trim();
auto handle = getHandleForFd(fd);
if (!handle)
@ -199,37 +197,30 @@ int sys_peername(int fd, struct sockaddr *addr_ptr, socklen_t max_addr_length,
frg::string<MemoryAllocator> ser(getSysdepsAllocator());
req.SerializeToString(&ser);
actions[0].type = kHelActionOffer;
actions[0].flags = kHelItemAncillary;
actions[1].type = kHelActionSendFromBuffer;
actions[1].flags = kHelItemChain;
actions[1].buffer = ser.data();
actions[1].length = ser.size();
actions[2].type = kHelActionRecvInline;
actions[2].flags = kHelItemChain;
actions[3].type = kHelActionRecvToBuffer;
actions[3].flags = 0;
actions[3].buffer = addr_ptr;
actions[3].length = max_addr_length;
HEL_CHECK(helSubmitAsync(handle, actions, 4,
globalQueue.getQueue(), 0, 0));
auto element = globalQueue.dequeueSingle();
auto offer = parseSimple(element);
auto send_req = parseSimple(element);
auto recv_resp = parseInline(element);
auto recv_addr = parseLength(element);
auto [offer, sendReq, recvResp, recvData] = exchangeMsgsSync(
handle,
helix_ng::offer(
helix_ng::sendBuffer(ser.data(), ser.size()),
helix_ng::recvInline(),
helix_ng::recvBuffer(addr_ptr, max_addr_length)
)
);
HEL_CHECK(offer->error);
HEL_CHECK(send_req->error);
HEL_CHECK(recv_resp->error);
HEL_CHECK(recv_addr->error);
HEL_CHECK(offer.error());
HEL_CHECK(sendReq.error());
HEL_CHECK(recvResp.error());
HEL_CHECK(recvData.error());
managarm::fs::SvrResponse<MemoryAllocator> resp(getSysdepsAllocator());
resp.ParseFromArray(recv_resp->data, recv_resp->length);
__ensure(resp.error() == managarm::fs::Errors::SUCCESS);
*actual_length = resp.file_size();
return 0;
resp.ParseFromArray(recvResp.data(), recvResp.length());
if(resp.error() == managarm::fs::Errors::ILLEGAL_REQUEST) {
return ENOTSOCK;
}else{
__ensure(resp.error() == managarm::fs::Errors::SUCCESS);
*actual_length = resp.file_size();
return 0;
}
}
int sys_getsockopt(int fd, int layer, int number,