eliott/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2026-05-09 00:22:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Kernel/Net: Rename IPv4-specific files and structs

Browse Source
This commit is contained in:
Logkos
2024-07-26 22:13:33 +03:00
committed by Nico Weber
parent f82e976df4
commit ad73adef5d
18 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Kernel/CMakeLists.txt
View File

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

2
Kernel/FileSystem/SysFS/Subsystems/Kernel/Network/ARP.cpp
View File

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

4
Kernel/Net/ICMP.h
View File

@@ -7,9 +7,9 @@
#pragma once
#include <AK/MACAddress.h>
#include <Kernel/Net/IPv4.h>
#include <Kernel/Net/IPv4/IPv4.h>
struct ICMPType {
struct ICMPv4Type {
enum {
EchoReply = 0,
EchoRequest = 8,

2
Kernel/Net/ARP.h → Kernel/Net/IPv4/ARP.h
View File

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

0
Kernel/Net/IPv4.h → Kernel/Net/IPv4/IPv4.h
View File

6
Kernel/Net/IPv4Socket.cpp → Kernel/Net/IPv4/Socket.cpp
View File

@@ -11,10 +11,10 @@
#include <Kernel/API/POSIX/errno.h>
#include <Kernel/Debug.h>
#include <Kernel/FileSystem/OpenFileDescription.h>
#include <Kernel/Net/ARP.h>
#include <Kernel/Net/ICMP.h>
#include <Kernel/Net/IPv4.h>
#include <Kernel/Net/IPv4Socket.h>
#include <Kernel/Net/IPv4/ARP.h>
#include <Kernel/Net/IPv4/IPv4.h>
#include <Kernel/Net/IPv4/Socket.h>
#include <Kernel/Net/NetworkAdapter.h>
#include <Kernel/Net/NetworkingManagement.h>
#include <Kernel/Net/Routing.h>

4
Kernel/Net/IPv4Socket.h → Kernel/Net/IPv4/Socket.h
View File

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

2
Kernel/Net/IPv4SocketTuple.h → Kernel/Net/IPv4/SocketTuple.h
View File

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

4
Kernel/Net/NetworkAdapter.h
View File

@@ -17,10 +17,10 @@
#include <Kernel/Library/LockWeakPtr.h>
#include <Kernel/Library/LockWeakable.h>
#include <Kernel/Library/UserOrKernelBuffer.h>
#include <Kernel/Net/ARP.h>
#include <Kernel/Net/EthernetFrameHeader.h>
#include <Kernel/Net/ICMP.h>
#include <Kernel/Net/IPv4.h>
#include <Kernel/Net/IPv4/ARP.h>
#include <Kernel/Net/IPv4/IPv4.h>
namespace Kernel {

10
Kernel/Net/NetworkTask.cpp
View File

@@ -7,12 +7,12 @@
#include <Kernel/Debug.h>
#include <Kernel/Locking/Mutex.h>
#include <Kernel/Locking/MutexProtected.h>
#include <Kernel/Net/ARP.h>
#include <Kernel/Net/EtherType.h>
#include <Kernel/Net/EthernetFrameHeader.h>
#include <Kernel/Net/ICMP.h>
#include <Kernel/Net/IPv4.h>
#include <Kernel/Net/IPv4Socket.h>
#include <Kernel/Net/IPv4/ARP.h>
#include <Kernel/Net/IPv4/IPv4.h>
#include <Kernel/Net/IPv4/Socket.h>
#include <Kernel/Net/LoopbackAdapter.h>
#include <Kernel/Net/NetworkTask.h>
#include <Kernel/Net/NetworkingManagement.h>
@@ -242,7 +242,7 @@ void handle_icmp(EthernetFrameHeader const& eth, IPv4Packet const& ipv4_packet,
if (!adapter)
return;
if (icmp_header.type() == ICMPType::EchoRequest) {
if (icmp_header.type() == ICMPv4Type::EchoRequest) {
auto& request = reinterpret_cast<ICMPEchoPacket const&>(icmp_header);
dbgln("handle_icmp: EchoRequest from {}: id={}, seq={}", ipv4_packet.source(), (u16)request.identifier, (u16)request.sequence_number);
size_t icmp_packet_size = ipv4_packet.payload_size();
@@ -259,7 +259,7 @@ void handle_icmp(EthernetFrameHeader const& eth, IPv4Packet const& ipv4_packet,
adapter->fill_in_ipv4_header(*packet, adapter->ipv4_address(), eth.source(), ipv4_packet.source(), IPv4Protocol::ICMP, icmp_packet_size, 0, 64);
memset(packet->buffer->data() + ipv4_payload_offset, 0, sizeof(ICMPEchoPacket));
auto& response = *(ICMPEchoPacket*)(packet->buffer->data() + ipv4_payload_offset);
response.header.set_type(ICMPType::EchoReply);
response.header.set_type(ICMPv4Type::EchoReply);
response.header.set_code(0);
response.identifier = request.identifier;
response.sequence_number = request.sequence_number;

2
Kernel/Net/Socket.cpp
View File

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

2
Kernel/Net/TCP.h
View File

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

2
Kernel/Net/TCPSocket.cpp
View File

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

2
Kernel/Net/TCPSocket.h
View File

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

2
Kernel/Net/UDP.h
View File

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

2
Kernel/Net/UDPSocket.h
View File

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

2
Meta/gn/secondary/Kernel/BUILD.gn
View File

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

2
Userland/Libraries/LibC/netdb.cpp
View File

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