From 0bab28c0bd18274a9aff69ce0249ae9b8009dfa4 Mon Sep 17 00:00:00 2001
From: Anton Kling <anton@kling.gg>
Date: Fri, 28 Jun 2024 12:58:19 +0200
Subject: Kernel: Change naming scheme for certain structs
---
kernel/drivers/rtl8139.c | 10 +++++-----
kernel/network/ethernet.c | 16 ++++++++--------
kernel/network/tcp.c | 14 +++++++-------
3 files changed, 20 insertions(+), 20 deletions(-)
(limited to 'kernel')
diff --git a/kernel/drivers/rtl8139.c b/kernel/drivers/rtl8139.c
index 6214d73..caacd3c 100644
--- a/kernel/drivers/rtl8139.c
+++ b/kernel/drivers/rtl8139.c
@@ -28,7 +28,7 @@ u8 *device_buffer;
u8 *send_buffers[4];
int send_buffers_loop = 0;
-struct _INT_PACKET_HEADER {
+struct IntPacketHeader {
u8 ROK : 1;
u8 FAE : 1;
u8 CRC : 1;
@@ -41,17 +41,17 @@ struct _INT_PACKET_HEADER {
u8 MAR : 1;
} __attribute__((packed));
-struct PACKET_HEADER {
+struct RTL8139PacketHeader {
union {
u16 raw;
- struct _INT_PACKET_HEADER data;
+ struct IntPacketHeader data;
};
} __attribute__((packed));
unsigned short current_packet_read = 0;
void handle_packet(void) {
- assert(sizeof(struct _INT_PACKET_HEADER) == sizeof(u16));
+ assert(sizeof(struct IntPacketHeader) == sizeof(u16));
int had_error = 0;
@@ -60,7 +60,7 @@ void handle_packet(void) {
u16 rx_size = *(u16 *)(device_buffer + ring_offset + sizeof(u16));
- struct PACKET_HEADER packet_header;
+ struct RTL8139PacketHeader packet_header;
packet_header.raw = device_buffer[ring_offset + 0];
int error = (packet_header.data.FAE) || (packet_header.data.CRC) ||
diff --git a/kernel/network/ethernet.c b/kernel/network/ethernet.c
index deb942b..7b1de7f 100644
--- a/kernel/network/ethernet.c
+++ b/kernel/network/ethernet.c
@@ -9,7 +9,7 @@
#include <stdio.h>
#include <string.h>
-struct ETHERNET_HEADER {
+struct EthernetHeader {
u8 mac_dst[6];
u8 mac_src[6];
u16 type;
@@ -49,10 +49,10 @@ u32 crc32(const char *buf, size_t len) {
}
void handle_ethernet(const u8 *packet, u64 packet_length) {
- struct ETHERNET_HEADER *eth_header = (struct ETHERNET_HEADER *)packet;
- packet += sizeof(struct ETHERNET_HEADER);
+ struct EthernetHeader *eth_header = (struct EthernetHeader *)packet;
+ packet += sizeof(struct EthernetHeader);
const u8 *payload = packet;
- packet += packet_length - sizeof(struct ETHERNET_HEADER);
+ packet += packet_length - sizeof(struct EthernetHeader);
u16 type = ntohs(eth_header->type);
switch (type) {
@@ -60,7 +60,7 @@ void handle_ethernet(const u8 *packet, u64 packet_length) {
handle_arp(payload);
break;
case 0x0800:
- handle_ipv4(payload, packet_length - sizeof(struct ETHERNET_HEADER));
+ handle_ipv4(payload, packet_length - sizeof(struct EthernetHeader));
break;
default:
kprintf("Can't handle ethernet type 0x%x\n", type);
@@ -72,12 +72,12 @@ void send_ethernet_packet(u8 mac_dst[6], u16 type, u8 *payload,
u64 payload_length) {
// FIXME: Janky allocation, do this better
u64 buffer_size =
- sizeof(struct ETHERNET_HEADER) + payload_length + sizeof(u32);
+ sizeof(struct EthernetHeader) + payload_length + sizeof(u32);
u8 *buffer = kmalloc(buffer_size);
memset(buffer, 0, buffer_size);
u8 *buffer_start = buffer;
- struct ETHERNET_HEADER *eth_header = (struct ETHERNET_HEADER *)buffer;
- buffer += sizeof(struct ETHERNET_HEADER);
+ struct EthernetHeader *eth_header = (struct EthernetHeader *)buffer;
+ buffer += sizeof(struct EthernetHeader);
memcpy(buffer, payload, payload_length);
buffer += payload_length;
diff --git a/kernel/network/tcp.c b/kernel/network/tcp.c
index 8fbd490..acdbdb3 100644
--- a/kernel/network/tcp.c
+++ b/kernel/network/tcp.c
@@ -13,7 +13,7 @@
#define MSS 536
-struct __attribute__((__packed__)) __attribute__((aligned(2))) TCP_HEADER {
+struct __attribute__((__packed__)) __attribute__((aligned(2))) TcpHeader {
u16 src_port;
u16 dst_port;
u32 seq_num;
@@ -53,7 +53,7 @@ static inline u16 tcp_checksum_final(u32 cksum, const u8 *buffer, u32 size) {
}
u16 tcp_calculate_checksum(ipv4_t src_ip, u32 dst_ip, const u8 *payload,
- u16 payload_length, const struct TCP_HEADER *header,
+ u16 payload_length, const struct TcpHeader *header,
int total) {
if (total < header->data_offset + payload_length) {
return 0;
@@ -88,7 +88,7 @@ static void tcp_send(struct TcpConnection *con, u8 *buffer, u16 length,
}
void tcp_send_empty_payload(struct TcpConnection *con, u8 flags) {
- struct TCP_HEADER header;
+ struct TcpHeader header;
memset(&header, 0, sizeof(header));
header.src_port = htons(con->incoming_port);
header.dst_port = htons(con->outgoing_port);
@@ -109,7 +109,7 @@ void tcp_send_empty_payload(struct TcpConnection *con, u8 flags) {
u16 payload_length = 0;
header.checksum = tcp_calculate_checksum(
ip_address, con->outgoing_ip, (const u8 *)payload, payload_length,
- &header, sizeof(struct TCP_HEADER) + payload_length);
+ &header, sizeof(struct TcpHeader) + payload_length);
int send_len = sizeof(header) + payload_length;
u8 *send_buffer = kmalloc(send_len);
memcpy(send_buffer, &header, sizeof(header));
@@ -173,7 +173,7 @@ int send_tcp_packet(struct TcpConnection *con, const u8 *payload,
payload += len;
return send_tcp_packet(con, payload, payload_length);
}
- struct TCP_HEADER header = {0};
+ struct TcpHeader header = {0};
header.src_port = htons(con->incoming_port);
header.dst_port = htons(con->outgoing_port);
header.seq_num = htonl(con->snd_nxt);
@@ -185,7 +185,7 @@ int send_tcp_packet(struct TcpConnection *con, const u8 *payload,
header.urgent_pointer = 0;
header.checksum = tcp_calculate_checksum(
ip_address, con->outgoing_ip, (const u8 *)payload, payload_length,
- &header, sizeof(struct TCP_HEADER) + payload_length);
+ &header, sizeof(struct TcpHeader) + payload_length);
int send_len = sizeof(header) + payload_length;
u8 *send_buffer = kmalloc(send_len);
assert(send_buffer);
@@ -201,7 +201,7 @@ int send_tcp_packet(struct TcpConnection *con, const u8 *payload,
void handle_tcp(ipv4_t src_ip, ipv4_t dst_ip, const u8 *payload,
u32 payload_length) {
- const struct TCP_HEADER *header = (const struct TCP_HEADER *)payload;
+ const struct TcpHeader *header = (const struct TcpHeader *)payload;
u32 tcp_payload_length = payload_length - header->data_offset * sizeof(u32);
const u8 *tcp_payload = payload + header->data_offset * sizeof(u32);
u16 checksum =
--
cgit v1.2.3