From cd2dbb2e146562c9e37c614bb09a24f7fbf135e0 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Thu, 3 Dec 2020 22:26:46 +0100
Subject: Quite important network stuff

---
 kernel/features/net.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'kernel/features/net.c')

diff --git a/kernel/features/net.c b/kernel/features/net.c
index 26bdc0f..ab747e4 100644
--- a/kernel/features/net.c
+++ b/kernel/features/net.c
@@ -521,12 +521,7 @@ static void tcp_handle_packet(struct tcp_packet *packet, u32 dst, int len)
 		tcp->ack_no += data_length;
 		tcp->seq_no = recv_ack;
 
-		// TODO: How many segments are going to be sent?!
-		if ((flags & 0xff) == (TCP_FLAG_ACK | TCP_FLAG_PSH)) {
-			tcp_send_packet(socket, TCP_FLAG_ACK, NULL, 0);
-			tcp_send_packet(socket, TCP_FLAG_FIN | TCP_FLAG_ACK, NULL, 0);
-			tcp->state++;
-		}
+		tcp_send_packet(socket, TCP_FLAG_ACK, NULL, 0);
 
 		socket->state = S_CONNECTED;
 		return;
@@ -740,6 +735,16 @@ int net_close(struct socket *socket)
 	if (!net_installed())
 		return 1;
 
+	if (socket->state == S_CLOSING)
+		return 0;
+
+	if (socket->type == S_TCP && socket->state != S_CLOSED) {
+		tcp_send_packet(socket, TCP_FLAG_FIN | TCP_FLAG_ACK, NULL, 0);
+		socket->state = S_CLOSING;
+		socket->prot.tcp.state++;
+		return 0;
+	}
+
 	return socket_close(socket);
 }
 
-- 
cgit v1.2.3