Kernel: Move networking related files into Kernel/Net/.

Kernel/Makefile

@@ -34,14 +34,14 @@ KERNEL_OBJS = \
        PS2MouseDevice.o \
        Socket.o \
        LocalSocket.o \
-       IPv4Socket.o \
-       TCPSocket.o \
-       UDPSocket.o \
-       NetworkAdapter.o \
-       E1000NetworkAdapter.o \
+       Net/IPv4Socket.o \
+       Net/TCPSocket.o \
+       Net/UDPSocket.o \
+       Net/NetworkAdapter.o \
+       Net/E1000NetworkAdapter.o \
        Net/LoopbackAdapter.o \
        Net/Routing.o \
-       NetworkTask.o
+       Net/NetworkTask.o
 
 VFS_OBJS = \
     DiskDevice.o \

Kernel/Net/ARP.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <Kernel/MACAddress.h>
-#include <Kernel/IPv4.h>
-#include <Kernel/EtherType.h>
+#include <Kernel/Net/MACAddress.h>
+#include <Kernel/Net/IPv4.h>
+#include <Kernel/Net/EtherType.h>
 
 struct ARPOperation {
 enum : word {

Kernel/Net/E1000NetworkAdapter.cpp

@@ -1,4 +1,4 @@
-#include <Kernel/E1000NetworkAdapter.h>
+#include <Kernel/Net/E1000NetworkAdapter.h>
 #include <Kernel/PCI.h>
 #include <Kernel/IO.h>
 

Kernel/Net/E1000NetworkAdapter.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Kernel/NetworkAdapter.h>
+#include <Kernel/Net/NetworkAdapter.h>
 #include <Kernel/PCI.h>
 #include <Kernel/MemoryManager.h>
 #include <Kernel/IRQHandler.h>

Kernel/Net/EthernetFrameHeader.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Kernel/MACAddress.h>
+#include <Kernel/Net/MACAddress.h>
 #include <Kernel/NetworkOrdered.h>
 
 class [[gnu::packed]] EthernetFrameHeader {

Kernel/Net/ICMP.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <Kernel/MACAddress.h>
-#include <Kernel/IPv4.h>
+#include <Kernel/Net/MACAddress.h>
+#include <Kernel/Net/IPv4.h>
 
 struct ICMPType {
 enum {

Kernel/Net/IPv4Socket.cpp

@@ -1,14 +1,14 @@
-#include <Kernel/IPv4Socket.h>
-#include <Kernel/TCPSocket.h>
-#include <Kernel/UDPSocket.h>
+#include <Kernel/Net/IPv4Socket.h>
+#include <Kernel/Net/TCPSocket.h>
+#include <Kernel/Net/UDPSocket.h>
 #include <Kernel/UnixTypes.h>
 #include <Kernel/Process.h>
-#include <Kernel/NetworkAdapter.h>
-#include <Kernel/IPv4.h>
-#include <Kernel/ICMP.h>
-#include <Kernel/TCP.h>
-#include <Kernel/UDP.h>
-#include <Kernel/ARP.h>
+#include <Kernel/Net/NetworkAdapter.h>
+#include <Kernel/Net/IPv4.h>
+#include <Kernel/Net/ICMP.h>
+#include <Kernel/Net/TCP.h>
+#include <Kernel/Net/UDP.h>
+#include <Kernel/Net/ARP.h>
 #include <Kernel/Net/Routing.h>
 #include <LibC/errno_numbers.h>
 

Kernel/Net/IPv4Socket.h

@@ -2,7 +2,7 @@
 
 #include <Kernel/Socket.h>
 #include <Kernel/DoubleBuffer.h>
-#include <Kernel/IPv4.h>
+#include <Kernel/Net/IPv4.h>
 #include <AK/HashMap.h>
 #include <Kernel/Lock.h>
 #include <AK/SinglyLinkedList.h>

Kernel/Net/LoopbackAdapter.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Kernel/NetworkAdapter.h>
+#include <Kernel/Net/NetworkAdapter.h>
 
 class LoopbackAdapter final : public NetworkAdapter {
 public:

Kernel/Net/NetworkAdapter.cpp

@@ -1,8 +1,8 @@
-#include <Kernel/NetworkAdapter.h>
+#include <Kernel/Net/NetworkAdapter.h>
+#include <Kernel/Net/EthernetFrameHeader.h>
+#include <Kernel/Net/EtherType.h>
 #include <Kernel/StdLib.h>
-#include <Kernel/EthernetFrameHeader.h>
 #include <Kernel/kmalloc.h>
-#include <Kernel/EtherType.h>
 #include <AK/HashTable.h>
 #include <Kernel/Lock.h>
 

Kernel/Net/NetworkAdapter.h

@@ -3,10 +3,10 @@
 #include <AK/ByteBuffer.h>
 #include <AK/SinglyLinkedList.h>
 #include <AK/Types.h>
-#include <Kernel/MACAddress.h>
-#include <Kernel/IPv4.h>
-#include <Kernel/ARP.h>
-#include <Kernel/ICMP.h>
+#include <Kernel/Net/MACAddress.h>
+#include <Kernel/Net/IPv4.h>
+#include <Kernel/Net/ARP.h>
+#include <Kernel/Net/ICMP.h>
 #include <Kernel/Alarm.h>
 
 class NetworkAdapter;

Kernel/Net/NetworkTask.cpp

@@ -1,17 +1,18 @@
-#include <Kernel/E1000NetworkAdapter.h>
-#include <Kernel/EthernetFrameHeader.h>
-#include <Kernel/ARP.h>
-#include <Kernel/ICMP.h>
-#include <Kernel/UDP.h>
-#include <Kernel/TCP.h>
-#include <Kernel/IPv4.h>
-#include <Kernel/IPv4Socket.h>
-#include <Kernel/TCPSocket.h>
-#include <Kernel/UDPSocket.h>
-#include <Kernel/Process.h>
-#include <Kernel/EtherType.h>
-#include <Kernel/Lock.h>
+#include <Kernel/Net/E1000NetworkAdapter.h>
+#include <Kernel/Net/EthernetFrameHeader.h>
+#include <Kernel/Net/ARP.h>
+#include <Kernel/Net/ICMP.h>
+#include <Kernel/Net/UDP.h>
+#include <Kernel/Net/TCP.h>
+#include <Kernel/Net/IPv4.h>
+#include <Kernel/Net/IPv4Socket.h>
+#include <Kernel/Net/TCPSocket.h>
+#include <Kernel/Net/UDPSocket.h>
 #include <Kernel/Net/LoopbackAdapter.h>
+#include <Kernel/Process.h>
+#include <Kernel/Net/EtherType.h>
+#include <Kernel/Lock.h>
+
 
 //#define ETHERNET_DEBUG
 #define IPV4_DEBUG

Kernel/Net/Routing.h

@@ -1,5 +1,5 @@
 #pragma once
 
-#include <Kernel/NetworkAdapter.h>
+#include <Kernel/Net/NetworkAdapter.h>
 
 NetworkAdapter* adapter_for_route_to(const IPv4Address&);

Kernel/Net/TCP.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Kernel/IPv4.h>
+#include <Kernel/Net/IPv4.h>
 
 struct TCPFlags {
 enum : word {

Kernel/Net/TCPSocket.cpp

@@ -1,8 +1,8 @@
-#include <Kernel/TCPSocket.h>
-#include <Kernel/TCP.h>
-#include <Kernel/NetworkAdapter.h>
-#include <Kernel/Process.h>
+#include <Kernel/Net/TCPSocket.h>
+#include <Kernel/Net/TCP.h>
+#include <Kernel/Net/NetworkAdapter.h>
 #include <Kernel/Net/Routing.h>
+#include <Kernel/Process.h>
 #include <Kernel/RandomDevice.h>
 
 Lockable<HashMap<word, TCPSocket*>>& TCPSocket::sockets_by_port()

Kernel/Net/TCPSocket.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Kernel/IPv4Socket.h>
+#include <Kernel/Net/IPv4Socket.h>
 
 class TCPSocket final : public IPv4Socket {
 public:

Kernel/Net/UDP.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Kernel/IPv4.h>
+#include <Kernel/Net/IPv4.h>
 
 class [[gnu::packed]] UDPPacket {
 public:

Kernel/Net/UDPSocket.cpp

@@ -1,6 +1,6 @@
-#include <Kernel/UDPSocket.h>
-#include <Kernel/UDP.h>
-#include <Kernel/NetworkAdapter.h>
+#include <Kernel/Net/UDPSocket.h>
+#include <Kernel/Net/UDP.h>
+#include <Kernel/Net/NetworkAdapter.h>
 #include <Kernel/Process.h>
 #include <Kernel/RandomDevice.h>
 #include <Kernel/Net/Routing.h>

Kernel/Net/UDPSocket.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Kernel/IPv4Socket.h>
+#include <Kernel/Net/IPv4Socket.h>
 
 class UDPSocketHandle;
 

Kernel/Process.cpp

@@ -22,9 +22,6 @@
 #include "MasterPTY.h"
 #include "elf.h"
 #include <AK/StringBuilder.h>
-#include <Kernel/E1000NetworkAdapter.h>
-#include <Kernel/EthernetFrameHeader.h>
-#include <Kernel/ARP.h>
 
 //#define DEBUG_IO
 //#define TASK_DEBUG

Kernel/Socket.cpp

@@ -1,6 +1,6 @@
 #include <Kernel/Socket.h>
 #include <Kernel/LocalSocket.h>
-#include <Kernel/IPv4Socket.h>
+#include <Kernel/Net/IPv4Socket.h>
 #include <Kernel/UnixTypes.h>
 #include <Kernel/Process.h>
 #include <LibC/errno_numbers.h>

Kernel/init.cpp

@@ -23,8 +23,8 @@
 #include "PTYMultiplexer.h"
 #include "DevPtsFS.h"
 #include "BXVGADevice.h"
-#include "E1000NetworkAdapter.h"
-#include <Kernel/NetworkTask.h>
+#include <Kernel/Net/E1000NetworkAdapter.h>
+#include <Kernel/Net/NetworkTask.h>
 
 #define SPAWN_LAUNCHER
 //#define SPAWN_GUITEST2