Bananymous/banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kernel: Move Ethernet header prepending from NIC to helper

Browse Source
This commit is contained in:
Bananymous
2026-06-28 22:12:12 +03:00
parent 223835c37d
commit 17e6e53948
12 changed files with 70 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/include/kernel/Networking/E1000/E1000.h
View File

@@ -45,7 +45,7 @@ namespace Kernel
uint32_t read32(uint16_t reg);
void write32(uint16_t reg, uint32_t value);
BAN::ErrorOr<void> send_bytes(BAN::MACAddress destination, EtherType protocol, BAN::Span<const BAN::ConstByteSpan> payload) override;
BAN::ErrorOr<void> send_raw_bytes(BAN::Span<const BAN::ConstByteSpan> buffers) override;
bool can_read_impl() const override { return false; }
bool can_write_impl() const override { return false; }

2
kernel/include/kernel/Networking/IPv4Layer.h
View File

@@ -48,7 +48,7 @@ namespace Kernel
virtual BAN::ErrorOr<void> bind_socket_to_address(BAN::RefPtr<NetworkSocket>, const sockaddr* address, socklen_t address_len) override;
virtual BAN::ErrorOr<void> get_socket_address(BAN::RefPtr<NetworkSocket>, sockaddr* address, socklen_t* address_len) override;
virtual BAN::ErrorOr<size_t> sendto(NetworkSocket&, BAN::ConstByteSpan, const sockaddr*, socklen_t) override;
virtual BAN::ErrorOr<void> sendto(NetworkSocket&, BAN::ConstByteSpan, const sockaddr*, socklen_t) override;
virtual Socket::Domain domain() const override { return Socket::Domain::INET ;}
virtual size_t header_size() const override { return sizeof(IPv4Header); }

2
kernel/include/kernel/Networking/Loopback.h
View File

@@ -27,7 +27,7 @@ namespace Kernel
{}
~LoopbackInterface();
BAN::ErrorOr<void> send_bytes(BAN::MACAddress destination, EtherType protocol, BAN::Span<const BAN::ConstByteSpan> payload) override;
BAN::ErrorOr<void> send_raw_bytes(BAN::Span<const BAN::ConstByteSpan> buffers) override;
bool can_read_impl() const override { return false; }
bool can_write_impl() const override { return false; }

25
kernel/include/kernel/Networking/NetworkInterface.h
View File

@@ -59,11 +59,30 @@ namespace Kernel
virtual BAN::StringView name() const override { return m_name; }
BAN::ErrorOr<void> send_bytes(BAN::MACAddress destination, EtherType protocol, BAN::ConstByteSpan payload)
BAN::ErrorOr<void> send_with_ethernet_header(BAN::MACAddress dst_mac, EtherType ether_type, BAN::ConstByteSpan buffer)
{
return send_bytes(destination, protocol, { &payload, 1 });
BAN::ConstByteSpan buffer_array[1] { buffer };
return send_with_ethernet_header(dst_mac, ether_type, buffer_array);
}
virtual BAN::ErrorOr<void> send_bytes(BAN::MACAddress destination, EtherType protocol, BAN::Span<const BAN::ConstByteSpan> payload) = 0;
template<size_t SIZE>
BAN::ErrorOr<void> send_with_ethernet_header(BAN::MACAddress dst_mac, EtherType ether_type, const BAN::ConstByteSpan (&buffer_array)[SIZE])
{
const auto ethernet_header = EthernetHeader {
.dst_mac = dst_mac,
.src_mac = get_mac_address(),
.ether_type = ether_type,
};
BAN::ConstByteSpan new_buffer_array[SIZE + 1];
new_buffer_array[0] = BAN::ConstByteSpan::from(ethernet_header);
for (size_t i = 0; i < SIZE; i++)
new_buffer_array[i + 1] = buffer_array[i];
return send_raw_bytes({ new_buffer_array, SIZE + 1 });
}
virtual BAN::ErrorOr<void> send_raw_bytes(BAN::Span<const BAN::ConstByteSpan> buffers) = 0;
private:
BAN::ErrorOr<long> ioctl_impl(int, void*) override;

2
kernel/include/kernel/Networking/NetworkLayer.h
View File

@@ -27,7 +27,7 @@ namespace Kernel
virtual BAN::ErrorOr<void> bind_socket_to_address(BAN::RefPtr<NetworkSocket>, const sockaddr* address, socklen_t address_len) = 0;
virtual BAN::ErrorOr<void> get_socket_address(BAN::RefPtr<NetworkSocket>, sockaddr* address, socklen_t* address_len) = 0;
virtual BAN::ErrorOr<size_t> sendto(NetworkSocket&, BAN::ConstByteSpan, const sockaddr*, socklen_t) = 0;
virtual BAN::ErrorOr<void> sendto(NetworkSocket&, BAN::ConstByteSpan, const sockaddr*, socklen_t) = 0;
virtual Socket::Domain domain() const = 0;
virtual size_t header_size() const = 0;

4
kernel/include/kernel/Networking/RTL8169/RTL8169.h
View File

@@ -20,7 +20,7 @@ namespace Kernel
virtual bool link_up() override { return m_link_up; }
virtual int link_speed() override;
virtual size_t payload_mtu() const override { return 7436 - sizeof(EthernetHeader); }
virtual size_t payload_mtu() const override { return 0x1FF8 - sizeof(EthernetHeader); }
virtual void handle_irq() override;
@@ -33,7 +33,7 @@ namespace Kernel
BAN::ErrorOr<void> initialize();
virtual BAN::ErrorOr<void> send_bytes(BAN::MACAddress destination, EtherType protocol, BAN::Span<const BAN::ConstByteSpan>) override;
virtual BAN::ErrorOr<void> send_raw_bytes(BAN::Span<const BAN::ConstByteSpan> buffers) override;
virtual bool can_read_impl() const override { return false; }
virtual bool can_write_impl() const override { return false; }