mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-10-28 21:28:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

sockets: actually use socklen_t

Browse Source
This commit is contained in:
Matheus
2022-10-22 23:41:11 -03:00
parent f08e86bbc0
commit 729b025b19
9 changed files with 120 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sys/mm/vmm.c
+21 -15
View File
@@ -187,7 +187,7 @@ static bool setmap(vmm_mapping** mapstart, void* addr, size_t pagec, size_t mmuf
return false;
}
// unallocate entries inbetween
// unallocate entries inbetween TODO sync file
vmm_mapping* loopmap = map->next;
@@ -225,7 +225,7 @@ static bool setmap(vmm_mapping** mapstart, void* addr, size_t pagec, size_t mmuf
}
// do we need to split?
// do we need to split? TODO add more file refs
if(map->start != newmap->start && map->end != newmap->end){
vmm_mapping* splitmap = allocatefirst();
@@ -324,7 +324,8 @@ static bool unmap(vmm_mapping** mapstart, void* addr, size_t pagec){
vmm_mapping *map = *mapstart;
void* savedaddr = addr;
arch_mmu_tableptr context = arch_getcls()->context->context;
int err;
for(size_t page = 0; page < pagec; ++page, addr += PAGE_SIZE){
map = findmappingfromaddr(map, addr);
switch(map->type){
@@ -337,7 +338,10 @@ static bool unmap(vmm_mapping** mapstart, void* addr, size_t pagec){
break;
case VMM_TYPE_FILE:
_panic("File mappings not supported!", 0);
vfs_write(&err, map->data, addr, PAGE_SIZE, map->offset + page*PAGE_SIZE);
void* paddr = arch_mmu_getphysicaladdr(context, addr);
pmm_free(paddr, 1);
arch_mmu_unmap(context, addr);
default:
continue;
@@ -397,9 +401,7 @@ int vmm_fork(vmm_context* oldctx, vmm_context* newctx){
vmm_mapping* mapping = oldctx->userstart;
while(mapping){
if(mapping->type == VMM_TYPE_FILE)
_panic("File mappings not supported yet!", NULL);
size_t pagesize =((uintptr_t)mapping->end - (uintptr_t)mapping->start + 1) / PAGE_SIZE;
@@ -407,6 +409,10 @@ int vmm_fork(vmm_context* oldctx, vmm_context* newctx){
goto _fail;
if(mapping->type == VMM_TYPE_FILE)
++((vnode_t*)mapping->data)->refcount;
if(mapping->type == VMM_TYPE_ANON){
@@ -656,9 +662,6 @@ bool vmm_dealwithrequest(void* addr, long error, bool user){
goto done;
}
if(map->type == VMM_TYPE_FILE)
_panic("File mappings are not supported (yet)", 0);
size_t goodmmuflags = 1;
if(error & ARCH_MMU_ERROR_WRITE)
@@ -680,9 +683,6 @@ bool vmm_dealwithrequest(void* addr, long error, bool user){
// allocate a page
addr = (size_t)addr & ~(0xFFF);
//printf("Demand paging %p\n", addr);
cls_t* cls = arch_getcls();
@@ -696,9 +696,15 @@ bool vmm_dealwithrequest(void* addr, long error, bool user){
goto done;
}
status = true;
memset(addr, 0, PAGE_SIZE);
if(map->type == VMM_TYPE_FILE){ // TODO check for errors?
int err;
size_t offset = addr - map->start;
vfs_read(&err, map->data, addr, PAGE_SIZE, map->offset + offset);
}
status = true;
done:
src/sys/socket.c
+15 -5
View File
@@ -3,6 +3,7 @@
#include <errno.h>
#include <kernel/alloc.h>
#include <arch/spinlock.h>
#include <poll.h>
int socket_new(struct _socket_t** returnptr, int family, int type, int protocol){
@@ -18,7 +19,7 @@ int socket_new(struct _socket_t** returnptr, int family, int type, int protocol)
// TODO move around locks and tests
int socket_bind(struct _socket_t* sock, void* addr, size_t addrlen){
int socket_bind(struct _socket_t* sock, void* addr, socklen_t addrlen){
if(sock->addrlen)
return EINVAL;
@@ -64,7 +65,7 @@ int socket_listen(struct _socket_t* sock, int backlog){
}
int socket_connect(struct _socket_t* sock, void* addr, size_t addrlen){
int socket_connect(struct _socket_t* sock, void* addr, socklen_t addrlen){
switch(sock->family){
case AF_UNIX:
@@ -75,7 +76,7 @@ int socket_connect(struct _socket_t* sock, void* addr, size_t addrlen){
}
int socket_accept(socket_t** peer, socket_t* sock, void* addr, size_t* addrlen){
int socket_accept(socket_t** peer, socket_t* sock, void* addr, socklen_t* addrlen){
switch(sock->family){
case AF_UNIX:
return unsocket_accept(peer, sock, addr, addrlen);
@@ -84,7 +85,7 @@ int socket_accept(socket_t** peer, socket_t* sock, void* addr, size_t* addrlen){
}
}
int socket_send(socket_t* socket, void* buff, size_t len, int flags, int* count){
int socket_send(socket_t* socket, void* buff, socklen_t len, int flags, int* count){
switch(socket->family){
case AF_UNIX:
return unsocket_send(socket, buff, len, flags, count);
@@ -93,7 +94,7 @@ int socket_send(socket_t* socket, void* buff, size_t len, int flags, int* count)
}
}
int socket_recv(socket_t* socket, void* buff, size_t len, int flags, int* count){
int socket_recv(socket_t* socket, void* buff, socklen_t len, int flags, int* count){
switch(socket->family){
case AF_UNIX:
return unsocket_recv(socket, buff, len, flags, count);
@@ -101,3 +102,12 @@ int socket_recv(socket_t* socket, void* buff, size_t len, int flags, int* count)
return EINVAL;
}
}
int socket_poll(socket_t* socket, pollfd* fd){
switch(socket->family){
case AF_UNIX:
return unsocket_poll(socket, fd);
default:
return EINVAL;
}
}
src/sys/syscalls/accept.c
+1 -1
View File
@@ -6,7 +6,7 @@
extern fs_t kerneltmpfs;
syscallret syscall_accept(int sockfd, void* addr, size_t* addrlen){
syscallret syscall_accept(int sockfd, void* addr, socklen_t* addrlen){
syscallret retv;
retv.ret = -1;
src/sys/syscalls/bind.c
+1 -1
View File
@@ -6,7 +6,7 @@
#include <sys/stat.h>
#include <kernel/socket.h>
syscallret syscall_bind(int sockfd, void* addr, size_t addrlen){
syscallret syscall_bind(int sockfd, void* addr, socklen_t addrlen){
syscallret retv;
retv.ret = -1;
src/sys/syscalls/poll.c
+4
View File
@@ -4,6 +4,7 @@
#include <arch/cls.h>
#include <poll.h>
#include <kernel/sched.h>
#include <arch/interrupt.h>
#define MAXNFDS 4096
@@ -78,6 +79,9 @@ syscallret syscall_poll(pollfd *fds, size_t nfds, int timeoutms){
// TODO check for signal or timeout
if(timeoutms == 0) break;
arch_interrupt_disable();
sched_yield();
arch_interrupt_enable();
}
src/sys/unsocket.c
+41 -9
View File
@@ -7,6 +7,7 @@
#include <string.h>
#include <kernel/vfs.h>
#include <arch/interrupt.h>
#include <poll.h>
int unsocket_new(socket_t** returnptr, int type, int protocol){
@@ -33,7 +34,7 @@ int unsocket_new(socket_t** returnptr, int type, int protocol){
}
int unsocket_bind(struct _socket_t* sock, sockaddr_un* addr, size_t addrlen){
int unsocket_bind(struct _socket_t* sock, sockaddr_un* addr, socklen_t addrlen){
// copy address
@@ -80,7 +81,7 @@ int unsocket_bind(struct _socket_t* sock, sockaddr_un* addr, size_t addrlen){
}
int unsocket_connect(struct _socket_t* sock, void* addr, size_t addrlen){
int unsocket_connect(struct _socket_t* sock, void* addr, socklen_t addrlen){
// copy address
@@ -175,18 +176,17 @@ int unsocket_connect(struct _socket_t* sock, void* addr, size_t addrlen){
}
int unsocket_accept(socket_t** peer, socket_t* sock, void* addr, size_t* addrlen){
int unsocket_accept(socket_t** peer, socket_t* sock, void* addr, socklen_t* addrlen){
// TODO abort
size_t len = *addrlen;
socklen_t len = *addrlen;
int err = 0;
if(*addrlen > sizeof(sockaddr_un))
return EINVAL;
spinlock_acquire(&sock->lock);
if(sock->state != SOCKET_STATE_LISTENING){
@@ -202,8 +202,6 @@ int unsocket_accept(socket_t** peer, socket_t* sock, void* addr, size_t* addrlen
spinlock_acquire(&sock->lock);
}
// TODO put peer name here
*peer = socket_popfrombacklog(sock);
spinlock_release(&sock->lock);
@@ -214,7 +212,7 @@ int unsocket_accept(socket_t** peer, socket_t* sock, void* addr, size_t* addrlen
}
int unsocket_send(socket_t* socket, void* buff, size_t len, int flags, int* error){
int unsocket_send(socket_t* socket, void* buff, socklen_t len, int flags, int* error){
if(flags){ // right now no flags are supported
*error = EOPNOTSUPP;
@@ -266,7 +264,9 @@ int unsocket_send(socket_t* socket, void* buff, size_t len, int flags, int* erro
}
int unsocket_recv(socket_t* socket, void* buff, size_t len, int flags, int* error){
// TODO check for broken
int unsocket_recv(socket_t* socket, void* buff, socklen_t len, int flags, int* error){
if(flags){ // right now no flags are supported
*error = EOPNOTSUPP;
@@ -314,3 +314,35 @@ int unsocket_recv(socket_t* socket, void* buff, size_t len, int flags, int* erro
return readc;
}
int unsocket_poll(socket_t* socket, pollfd* fd){
spinlock_acquire(&socket->lock);
// TODO outgoing connect finished
switch(socket->state){
case SOCKET_STATE_LISTENING:
if(fd->events & POLLIN && socket->backlogend)
fd->revents |= POLLIN;
break;
case SOCKET_STATE_CONNECTED:
if(!socket->peer)
fd->revents |= POLLHUP;
if(fd->events & POLLIN && socket->buffer.write != socket->buffer.read)
fd->revents |= POLLIN;
if(fd->events & POLLOUT && socket->buffer.write != socket->buffer.read + socket->buffer.size)
fd->revents |= POLLOUT;
break;
default:
return 0;
}
spinlock_release(&socket->lock);
return 0;
}