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

tcp: Fixup socket receive buffers

Browse Source
This commit is contained in:
K Lange 2021-09-27 21:09:28 +09:00
parent 67a228e6ef
commit 62368bbf44
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/net/ipv4.c
View File

@ -646,8 +646,7 @@ static long sock_tcp_recv(sock_t * sock, struct msghdr * msg, int flags) {
if (sock->unread) {
if (sock->unread > msg->msg_iov[0].iov_len) {
sock->unread = 0;
long out = msg->msg_iov[0].iov_len;
unsigned long out = msg->msg_iov[0].iov_len;
sock->unread -= out;
memcpy(msg->msg_iov[0].iov_base, sock->buf, out);
char * x = malloc(sock->unread);
@ -656,7 +655,7 @@ static long sock_tcp_recv(sock_t * sock, struct msghdr * msg, int flags) {
sock->buf = x;
return out;
} else {
long out = sock->unread;
unsigned long out = sock->unread;
sock->unread = 0;
memcpy(msg->msg_iov[0].iov_base, sock->buf, out);
free(sock->buf);
@ -677,11 +676,12 @@ static long sock_tcp_recv(sock_t * sock, struct msghdr * msg, int flags) {
if (!data) {
return -EINTR;
}
long resp = ntohs(data->length) - sizeof(struct ipv4_packet) - sizeof(struct tcp_header);
unsigned long resp = ntohs(data->length) - sizeof(struct ipv4_packet) - sizeof(struct tcp_header);
if (resp > (long)msg->msg_iov[0].iov_len) {
if (resp > (unsigned long)msg->msg_iov[0].iov_len) {
memcpy(msg->msg_iov[0].iov_base, data->payload + sizeof(struct tcp_header),msg->msg_iov[0].iov_len);
resp -= msg->msg_iov[0].iov_len;
if (resp == 0xFFFFffffFFFFffff) printf("what\n");
sock->unread = resp;
sock->buf = malloc(resp);
memcpy(sock->buf, data->payload + sizeof(struct tcp_header) + msg->msg_iov[0].iov_len, resp);

4
kernel/net/socket.c
View File

@ -73,7 +73,9 @@ void * net_sock_get(sock_t * sock) {
int sock_generic_check(fs_node_t *node) {
sock_t * sock = (sock_t*)node;
return sock->rx_queue->length ? 0 : 1;
if (sock->rx_queue->length) return 0;
if (sock->unread) return 0;
return 1;
}
int sock_generic_wait(fs_node_t *node, void * process) {