restructure

Author: no382001

Makefile

@@ -1,5 +1,5 @@
-C_SOURCES = $(wildcard kernel/*.c drivers/*.c cpu/*.c libc/*.c apps/*.c)
-HEADERS = $(wildcard kernel/*.h drivers/*.h cpu/*.h libc/*.h apps/*.h)
+C_SOURCES = $(wildcard kernel/*.c drivers/*.c cpu/*.c libc/*.c apps/*.c net/*.c)
+HEADERS = $(wildcard kernel/*.h drivers/*.h cpu/*.h libc/*.h apps/*.h net/*.h)
 
 BUILD_DIR = _build
 OBJ = $(patsubst %.c, $(BUILD_DIR)/%.o, $(C_SOURCES)) $(BUILD_DIR)/cpu/interrupt.o $(BUILD_DIR)/cpu/task_switch.o
@@ -12,7 +12,7 @@ CFLAGS = -g -O0 -m32 -fno-pie -ffreestanding -nostdlib -fno-builtin -nodefaultli
 
 NETWORKING = -netdev tap,id=my_tap0,ifname=tap0 -device rtl8139,netdev=my_tap0
 
-$(shell mkdir -p $(BUILD_DIR)/boot $(BUILD_DIR)/kernel $(BUILD_DIR)/drivers $(BUILD_DIR)/cpu $(BUILD_DIR)/libc $(BUILD_DIR)/apps)
+$(shell mkdir -p $(BUILD_DIR)/boot $(BUILD_DIR)/kernel $(BUILD_DIR)/drivers $(BUILD_DIR)/cpu $(BUILD_DIR)/libc $(BUILD_DIR)/apps $(BUILD_DIR)/net)
 
 all: format bits $(BUILD_DIR)/kernel.elf disk/fat16.img
 

TODO

@@ -23,6 +23,11 @@ vfs:
   - can connect to outside atleast on qemu com1 
   - 9p could use udp
 
+networking:
+  - ethernet
+  - dhcp not working
+  - full of memory leaks, no queue to handle requests
+
 build disk:
   (if i have 9p this is kind of irrelevant)
   on generation save the img, remove it from clean and keep backups

kernel/kernel.c

@@ -51,7 +51,7 @@ void kernel_main(void) {
   ip_addr[2] = 2;
   ip_addr[3] = 15;
   char *str = "this is a message sent from the OS";
-  
+
   /*
   ethernet_send_packet(mac_addr, (void *)str, strlen(str), 0x0021);
   ip_send_packet(ip_addr, (void *)str, strlen(str));

drivers/arp.c net/arp.cdrivers/arp.c renamed to net/arp.c

@@ -1,9 +1,9 @@
 #include "arp.h"
+#include "drivers/serial.h"
 #include "libc/heap.h"
 #include "libc/mem.h"
 #include "network.h"
 #include "rtl8139.h"
-#include "serial.h"
 
 arp_table_entry_t arp_table[512];
 int arp_table_size;

drivers/arp.h net/arp.hdrivers/arp.h renamed to net/arp.h

@@ -87,49 +87,46 @@ void dhcp_request(uint8_t *requested_ip) {
 
   uint8_t *options = packet.options;
 
-  // Magic cookie
+  // magic cookie
   *((uint32_t *)(options)) = htonl(DHCP_MAGIC_COOKIE);
   options += 4;
 
-  // Message type (REQUEST)
+  // message type (REQUEST)
   uint8_t msg_type = DHCP_REQUEST;
   options = add_dhcp_option(options, DHCP_OPT_MSG_TYPE, 1, &msg_type);
 
-  // Client identifier
+  // client identifier
   uint8_t client_id[7];
-  client_id[0] = 1; // Hardware type (Ethernet)
+  client_id[0] = 0x1; // hardware type (Ethernet)
   get_mac_addr(client_id + 1);
   options = add_dhcp_option(options, DHCP_OPT_CLIENT_ID, 7, client_id);
 
-  // Requested IP address
   if (requested_ip) {
     options = add_dhcp_option(options, DHCP_OPT_REQUESTED_IP, 4, requested_ip);
   }
 
-  // Server identifier (if we have it)
+  // server identifier (if we have it)
   if (dhcp_server_ip != 0) {
     options =
         add_dhcp_option(options, 54, 4, &dhcp_server_ip); // 54 = Server ID
   }
 
-  // Host name (optional)
+  // host name (optional)
   char hostname[] = "os-dev";
   options =
       add_dhcp_option(options, DHCP_OPT_HOST_NAME, strlen(hostname), hostname);
 
-  // Parameter request list
+  // parameter request list
   uint8_t params[] = {
-      DHCP_OPT_SUBNET_MASK, // Subnet mask
-      DHCP_OPT_ROUTER,      // Router
+      DHCP_OPT_SUBNET_MASK, // subnet mask
+      DHCP_OPT_ROUTER,      // router
       DHCP_OPT_DNS          // DNS server
   };
   options =
       add_dhcp_option(options, DHCP_OPT_PARAM_REQ_LIST, sizeof(params), params);
 
-  // End option
   *(options++) = DHCP_OPT_END;
 
-  // Send the packet
   udp_send_packet(dst_ip, DHCP_CLIENT, DHCP_SERVER, &packet,
                   sizeof(dhcp_packet_t));
 }
@@ -139,7 +136,7 @@ void *get_dhcp_option(dhcp_packet_t *packet, uint8_t type) {
     return NULL;
   }
 
-  uint8_t *options = packet->options + 4; // Skip magic cookie
+  uint8_t *options = packet->options + 4; // skip magic cookie
 
   while (options < packet->options + sizeof(packet->options)) {
     uint8_t curr_type = *options;
@@ -174,10 +171,9 @@ void dhcp_handle_packet(dhcp_packet_t *packet) {
     return;
   }
 
-  // Get message type
   uint8_t *type_ptr = get_dhcp_option(packet, DHCP_OPT_MSG_TYPE);
   if (!type_ptr) {
-    return; // No message type option
+    return;
   }
 
   uint8_t msg_type = *type_ptr;

drivers/dhcp.c net/dhcp.cdrivers/dhcp.c renamed to net/dhcp.c

@@ -1,9 +1,9 @@
 #include "ip.h"
 #include "arp.h"
 #include "dhcp.h"
+#include "drivers/serial.h"
 #include "libc/string.h"
 #include "network.h"
-#include "serial.h"
 
 uint8_t my_ip[] = {10, 0, 2, 14};
 uint8_t test_target_ip[] = {10, 0, 2, 15};
@@ -46,51 +46,43 @@ uint16_t ip_calculate_checksum(ip_packet_t *packet) {
 }
 
 void ip_send_packet(uint8_t *dst_ip, void *data, uint32_t len) {
-  // Print what we're trying to send
   serial_debug("sending ip packet to %d.%d.%d.%d with data length %d",
                dst_ip[0], dst_ip[1], dst_ip[2], dst_ip[3], len);
 
-  // Allocate memory for the packet
   ip_packet_t *packet = (ip_packet_t *)kmalloc(sizeof(ip_packet_t) + len);
 
-  // Fill in the IP header
   packet->version_ihl = (4 << 4) | 5; // IPv4, header length 5 words (20 bytes)
   serial_debug("version_ihl = %x", packet->version_ihl);
 
   packet->tos = 0;
 
-  // Total length = header + data
   uint16_t total_length = sizeof(ip_packet_t) + len;
   packet->length = htons(total_length);
   serial_debug("total length = %d (%x in network order)", total_length,
                packet->length);
 
-  // Set identification field
   static uint16_t ip_id = 0;
   packet->id = htons(ip_id++);
 
-  // No fragmentation
+  // no fragmentation
   packet->flags_fragment = htons(0);
 
   // TTL and protocol
   packet->ttl = 64;
   packet->protocol = PROTOCOL_UDP; // Assuming UDP for DHCP
 
   uint8_t my_ip_address[4] = {0, 0, 0, 0};
-  // Set source and destination addresses
+
   memcpy(packet->src_ip, my_ip_address, 4);
   memcpy(packet->dst_ip, dst_ip, 4);
 
-  // Calculate checksum
-  packet->header_checksum = 0; // Must be zero for calculation
+  packet->header_checksum = 0;
   packet->header_checksum =
-      ip_calculate_checksum(packet); // Standard IP header is 20 bytes
+      ip_calculate_checksum(packet);
   serial_debug("ip checksum = %x", ntohs(packet->header_checksum));
 
-  // Copy the data
   memcpy(packet->data, data, len);
 
-  // Get the MAC address for the destination IP
   uint8_t dst_mac[6];
   if (arp_lookup(dst_ip, dst_mac) != 0) {
     serial_debug("no MAC found for IP %d.%d.%d.%d - sending ARP request",

drivers/dhcp.h net/dhcp.hdrivers/dhcp.h renamed to net/dhcp.h

@@ -1,10 +1,10 @@
 #include "network.h"
 #include "arp.h"
+#include "drivers/serial.h"
 #include "ip.h"
 #include "libc/heap.h"
 #include "libc/mem.h"
 #include "rtl8139.h"
-#include "serial.h"
 
 int ethernet_send_packet(uint8_t *dst_mac_addr, uint8_t *data, int len,
                          uint16_t protocol) {