Kernel/Net: Rename IPv4 directory to IP

Commit ad73adef5d needlessly introduced an IPv4 directory.
If we were to keep it, sharing common headers between IPv4 and IPv6
would be much messier, and may potentially increase code duplication.

This change renames the IPv4 directory to IP to aid with later IPv6
porting efforts.

Kernel/CMakeLists.txt

@@ -276,7 +276,7 @@ set(KERNEL_SOURCES
     Net/Intel/E1000NetworkAdapter.cpp
     Net/Realtek/RTL8168NetworkAdapter.cpp
     Net/VirtIO/VirtIONetworkAdapter.cpp
-    Net/IPv4/Socket.cpp
+    Net/IP/Socket.cpp
     Net/LocalSocket.cpp
     Net/LoopbackAdapter.cpp
     Net/NetworkAdapter.cpp

Kernel/FileSystem/SysFS/Subsystems/Kernel/Network/ARP.cpp

@@ -6,7 +6,7 @@
 
 #include <AK/JsonObjectSerializer.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Kernel/Network/ARP.h>
-#include <Kernel/Net/IPv4/ARP.h>
+#include <Kernel/Net/IP/ARP.h>
 #include <Kernel/Net/Routing.h>
 #include <Kernel/Sections.h>
 

Kernel/Net/ICMP.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include <AK/MACAddress.h>
-#include <Kernel/Net/IPv4/IPv4.h>
+#include <Kernel/Net/IP/IPv4.h>
 
 enum class ICMPType : u8 {
     EchoReply = 0,

Kernel/Net/IP/ARP.h

@@ -9,7 +9,7 @@
 #include <AK/Endian.h>
 #include <AK/MACAddress.h>
 #include <Kernel/Net/EtherType.h>
-#include <Kernel/Net/IPv4/IPv4.h>
+#include <Kernel/Net/IP/IPv4.h>
 
 namespace Kernel {
 

Kernel/Net/IP/Socket.cpp

@@ -12,10 +12,10 @@
 #include <Kernel/Debug.h>
 #include <Kernel/FileSystem/OpenFileDescription.h>
 #include <Kernel/Net/ICMP.h>
-#include <Kernel/Net/IPv4/ARP.h>
-#include <Kernel/Net/IPv4/IP.h>
-#include <Kernel/Net/IPv4/IPv4.h>
-#include <Kernel/Net/IPv4/Socket.h>
+#include <Kernel/Net/IP/ARP.h>
+#include <Kernel/Net/IP/IP.h>
+#include <Kernel/Net/IP/IPv4.h>
+#include <Kernel/Net/IP/Socket.h>
 #include <Kernel/Net/NetworkAdapter.h>
 #include <Kernel/Net/NetworkingManagement.h>
 #include <Kernel/Net/Routing.h>

Kernel/Net/IP/Socket.h

@@ -12,8 +12,8 @@
 #include <Kernel/Library/DoubleBuffer.h>
 #include <Kernel/Library/KBuffer.h>
 #include <Kernel/Locking/MutexProtected.h>
-#include <Kernel/Net/IPv4/IPv4.h>
-#include <Kernel/Net/IPv4/SocketTuple.h>
+#include <Kernel/Net/IP/IPv4.h>
+#include <Kernel/Net/IP/SocketTuple.h>
 #include <Kernel/Net/Socket.h>
 
 namespace Kernel {

Kernel/Net/IP/SocketTuple.h

@@ -11,7 +11,7 @@
 #include <Kernel/Library/KBuffer.h>
 #include <Kernel/Library/KString.h>
 #include <Kernel/Locking/Mutex.h>
-#include <Kernel/Net/IPv4/IPv4.h>
+#include <Kernel/Net/IP/IPv4.h>
 #include <Kernel/Net/Socket.h>
 
 namespace Kernel {

Kernel/Net/NetworkAdapter.h

@@ -20,9 +20,9 @@
 #include <Kernel/Library/UserOrKernelBuffer.h>
 #include <Kernel/Net/EthernetFrameHeader.h>
 #include <Kernel/Net/ICMP.h>
-#include <Kernel/Net/IPv4/ARP.h>
-#include <Kernel/Net/IPv4/IP.h>
-#include <Kernel/Net/IPv4/IPv4.h>
+#include <Kernel/Net/IP/ARP.h>
+#include <Kernel/Net/IP/IP.h>
+#include <Kernel/Net/IP/IPv4.h>
 
 namespace Kernel {
 

Kernel/Net/NetworkTask.cpp

@@ -10,10 +10,10 @@
 #include <Kernel/Net/EtherType.h>
 #include <Kernel/Net/EthernetFrameHeader.h>
 #include <Kernel/Net/ICMP.h>
-#include <Kernel/Net/IPv4/ARP.h>
-#include <Kernel/Net/IPv4/IP.h>
-#include <Kernel/Net/IPv4/IPv4.h>
-#include <Kernel/Net/IPv4/Socket.h>
+#include <Kernel/Net/IP/ARP.h>
+#include <Kernel/Net/IP/IP.h>
+#include <Kernel/Net/IP/IPv4.h>
+#include <Kernel/Net/IP/Socket.h>
 #include <Kernel/Net/LoopbackAdapter.h>
 #include <Kernel/Net/NetworkTask.h>
 #include <Kernel/Net/NetworkingManagement.h>

Kernel/Net/Socket.cpp

@@ -8,7 +8,7 @@
 #include <Kernel/API/POSIX/errno.h>
 #include <Kernel/Debug.h>
 #include <Kernel/FileSystem/OpenFileDescription.h>
-#include <Kernel/Net/IPv4/Socket.h>
+#include <Kernel/Net/IP/Socket.h>
 #include <Kernel/Net/LocalSocket.h>
 #include <Kernel/Net/NetworkingManagement.h>
 #include <Kernel/Net/Socket.h>

Kernel/Net/TCP.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <Kernel/Net/IPv4/IPv4.h>
+#include <Kernel/Net/IP/IPv4.h>
 
 namespace Kernel {
 

Kernel/Net/TCPSocket.cpp

@@ -11,8 +11,8 @@
 #include <Kernel/FileSystem/OpenFileDescription.h>
 #include <Kernel/Locking/MutexProtected.h>
 #include <Kernel/Net/EthernetFrameHeader.h>
-#include <Kernel/Net/IPv4/IP.h>
-#include <Kernel/Net/IPv4/IPv4.h>
+#include <Kernel/Net/IP/IP.h>
+#include <Kernel/Net/IP/IPv4.h>
 #include <Kernel/Net/NetworkAdapter.h>
 #include <Kernel/Net/NetworkingManagement.h>
 #include <Kernel/Net/Routing.h>

Kernel/Net/TCPSocket.h

@@ -14,7 +14,7 @@
 #include <AK/Time.h>
 #include <Kernel/Library/LockWeakPtr.h>
 #include <Kernel/Locking/MutexProtected.h>
-#include <Kernel/Net/IPv4/Socket.h>
+#include <Kernel/Net/IP/Socket.h>
 #include <Kernel/Time/TimerQueue.h>
 
 namespace Kernel {

Kernel/Net/UDP.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <Kernel/Net/IPv4/IPv4.h>
+#include <Kernel/Net/IP/IPv4.h>
 
 namespace Kernel {
 

Kernel/Net/UDPSocket.cpp

@@ -6,7 +6,7 @@
 
 #include <AK/Singleton.h>
 #include <Kernel/Devices/Generic/RandomDevice.h>
-#include <Kernel/Net/IPv4/IP.h>
+#include <Kernel/Net/IP/IP.h>
 #include <Kernel/Net/NetworkAdapter.h>
 #include <Kernel/Net/Routing.h>
 #include <Kernel/Net/UDP.h>

Kernel/Net/UDPSocket.h

@@ -8,7 +8,7 @@
 
 #include <AK/Error.h>
 #include <Kernel/Locking/MutexProtected.h>
-#include <Kernel/Net/IPv4/Socket.h>
+#include <Kernel/Net/IP/Socket.h>
 
 namespace Kernel {
 

Meta/gn/secondary/Kernel/BUILD.gn

@@ -696,7 +696,7 @@ executable("Kernel_bin") {
     "Memory/SharedInodeVMObject.cpp",
     "Memory/VMObject.cpp",
     "Memory/VirtualRange.cpp",
-    "Net/IPv4/Socket.cpp",
+    "Net/IP/Socket.cpp",
     "Net/Intel/E1000ENetworkAdapter.cpp",
     "Net/Intel/E1000NetworkAdapter.cpp",
     "Net/LocalSocket.cpp",

Userland/Libraries/LibC/netdb.cpp

@@ -8,7 +8,7 @@
 #include <AK/ByteBuffer.h>
 #include <AK/ByteString.h>
 #include <AK/ScopeGuard.h>
-#include <Kernel/Net/IPv4/IPv4.h>
+#include <Kernel/Net/IP/IPv4.h>
 #include <arpa/inet.h>
 #include <errno.h>
 #include <netdb.h>