fixing broken resize in etherframe handlers

Author: Glowman554

mckrnl/core/memory/heap.c

@@ -102,6 +102,7 @@ void print_allocations(const char* msg) {
 	debugf("--- End of heap allocations ---");
 }
 
+#if 0
 void expand_heap(size_t length) {
 	print_allocations("Before expanding heap");
 	if (length % 0x1000) {
@@ -114,7 +115,7 @@ void expand_heap(size_t length) {
 
 	for (size_t i = 0; i < page_count; i++) {
 		void* physical_page = pmm_alloc();
-        vmm_map_page(heap_end, (uintptr_t) heap_end, (uintptr_t) physical_page, PTE_PRESENT | PTE_WRITE);
+        vmm_map_page(kernel_context, (uintptr_t) heap_end, (uintptr_t) physical_page, PTE_PRESENT | PTE_WRITE);
 
         debugf("Mapped new heap page: virtual 0x%x to physical 0x%x\n", heap_end, physical_page);
 
@@ -129,6 +130,7 @@ void expand_heap(size_t length) {
 	new_segment->length = length - sizeof(heap_segment_header_t);
 	hsh_combine_backward(new_segment);
 }
+#endif
 
 void* kmalloc(size_t size) {
 	if (size % 0x10 > 0) { // it is not a multiple of 0x10
@@ -161,8 +163,13 @@ void* kmalloc(size_t size) {
 		current_seg = current_seg->next;
 	}
 
+#if 0
 	expand_heap(size);
 	return kmalloc(size);
+#else
+	print_allocations("Heap full");
+	abortf(false, "kernel heap full: could not allocate %d bytes", size);
+#endif
 }
 
 void* krealloc(void* ptr, size_t size) {

mckrnl/core/net/arp.c

@@ -157,7 +157,7 @@ void arp_init(network_stack_t* stack) {
 	memset(stack->arp, 0, sizeof(arp_provider_t));
 
 	memset(stack->arp->ip_cache, 0xff, sizeof(stack->arp->ip_cache));
-	memset(stack->arp->mac_cache, 0xff, sizeof(stack->arp->ip_cache));
+	memset(stack->arp->mac_cache, 0xff, sizeof(stack->arp->mac_cache));
 
 	stack->arp->handler.ether_type_be = BSWAP16(0x806);
 	stack->arp->handler.stack = stack;

mckrnl/core/net/etherframe.c

@@ -1,4 +1,3 @@
-#include "driver/nic_driver.h"
 #include <net/etherframe.h>
 #include <stdio.h>
 #include <memory/heap.h>
@@ -9,7 +8,7 @@
 
 void etherframe_register(network_stack_t* stack, ether_frame_handler_t handler) {
 	debugf("Registering etherframe handler for %d", handler.ether_type_be);
-	stack->ether_frame->handlers = kmalloc(sizeof(ether_frame_handler_t) * (stack->ether_frame->num_handlers + 1));
+	stack->ether_frame->handlers = krealloc(stack->ether_frame->handlers, sizeof(ether_frame_handler_t) * (stack->ether_frame->num_handlers + 1));
 	stack->ether_frame->handlers[stack->ether_frame->num_handlers] = handler;
 	stack->ether_frame->num_handlers++;
 }