allow passing void opaque into a udp server handler

Author: braindigitalis

include/udp.h

@@ -8,7 +8,7 @@
 #include "kernel.h"
 
 // Interrupt handler definition
-typedef void (*udp_daemon_handler)(uint32_t, uint16_t, uint16_t, void*, uint32_t);
+typedef void (*udp_daemon_handler)(uint32_t, uint16_t, uint16_t, void*, uint32_t, void* opaque);
 
 /**
  * @brief Raw structure for UDP
@@ -55,6 +55,7 @@ void udp_handle_packet([[maybe_unused]] ip_packet_t* encap_packet, udp_packet_t*
  * @param dst_port destination port to listen on. If 0 is passed, a random port above or equal to 1024
  * is allocated for use and will be returned as the return value.
  * @param handler handler for incoming packets
+ * @param opaque Opaque pointer passed to the handler
  * @return port number that was allocated
  */
-uint16_t udp_register_daemon(uint16_t dst_port, udp_daemon_handler handler);
+uint16_t udp_register_daemon(uint16_t dst_port, udp_daemon_handler handler, void* opaque);

src/basic/sockets.c

@@ -241,3 +241,5 @@ void sockwrite_statement(struct basic_ctx* ctx)
 	}
 }
 
+static void basic_udp_handle_packet(uint32_t src_ip, uint16_t src_port, uint16_t dst_port, void* data, uint32_t length, void* opaque) {
+}

src/debugger.c

@@ -198,7 +198,7 @@ void gdb_data(uint32_t src_ip, uint16_t src_port, uint8_t* data, uint32_t length
 	}
 }
 
-void debug_handle_packet(uint32_t src_ip, uint16_t src_port, uint16_t dst_port, void* data, uint32_t length)
+void debug_handle_packet(uint32_t src_ip, uint16_t src_port, uint16_t dst_port, void* data, uint32_t length, void* opaque)
 {
 	uint8_t identifier = *(uint8_t*)data;
 	switch (identifier) {
@@ -359,7 +359,7 @@ void init_debug()
 	setforeground(COLOUR_WHITE);
 	kprintf("(%ld bytes)\n", filesize);
 
-	udp_register_daemon(DEBUG_DST_PORT, &debug_handle_packet);
+	udp_register_daemon(DEBUG_DST_PORT, &debug_handle_packet, NULL);
 }
 
 const char* findsymbol(uint64_t address, uint64_t* offset) {

src/net/dhcp.c

@@ -1,6 +1,6 @@
 #include <kernel.h>
 
-void dhcp_handle_packet(uint32_t src_ip, uint16_t src_port, uint16_t dst_port, void* data, [[maybe_unused]] uint32_t length) {
+void dhcp_handle_packet(uint32_t src_ip, uint16_t src_port, uint16_t dst_port, void* data, uint32_t length, void* opaque) {
 	dhcp_packet_t* packet = (dhcp_packet_t*)data;
 	if(packet->op == DHCP_REPLY) {
 		uint8_t* type = get_dhcp_options(packet, OPT_TYPE);
@@ -48,7 +48,7 @@ void dhcp_discover() {
 	uint8_t request_ip[4] = { 0, 0, 0, 0 };
 	uint8_t dst_ip[4] = { 0xff, 0xff, 0xff, 0xff };
 	dhcp_packet_t packet;
-	udp_register_daemon(DHCP_DST_PORT, &dhcp_handle_packet);
+	udp_register_daemon(DHCP_DST_PORT, &dhcp_handle_packet, NULL);
 	memset(&packet, 0, sizeof(dhcp_packet_t));
 	uint16_t optsize = make_dhcp_packet(&packet, DHCPDISCOVER, request_ip, DHCP_TRANSACTION_IDENTIFIER, 0);
 	udp_send_packet(dst_ip, DHCP_DST_PORT, DHCP_SRC_PORT, &packet, optsize);

src/net/dns.c

@@ -168,7 +168,7 @@ static int dns_make_payload(const char * const name, const uint8_t rr, const uns
  * @param data raw packet data
  * @param length length of packet
  */
-void dns_handle_packet(uint32_t src_ip, uint16_t src_port, uint16_t dst_port, void* data, uint32_t length) {
+void dns_handle_packet(uint32_t src_ip, uint16_t src_port, uint16_t dst_port, void* data, uint32_t length, void* opaque) {
 	dns_header_t* packet = (dns_header_t*)data;
 	uint16_t inbound_id = ntohs(packet->id);
 	dns_request_t findrequest = { .id = inbound_id };
@@ -534,7 +534,7 @@ void init_dns()
 	dns_replies = hashmap_new(sizeof(dns_request_t), 0, 6453563734, 7645356235, dns_request_hash, dns_request_compare, NULL, NULL);
 	dns_cache = hashmap_new(sizeof(dns_cache_entry_t), 0, 6453563734, 7645356235, dns_cache_hash, dns_cache_compare, NULL, NULL);
 	/* Let the IP stack decide on the port number to use */
-	dns_query_port = udp_register_daemon(0, &dns_handle_packet);
+	dns_query_port = udp_register_daemon(0, &dns_handle_packet, NULL);
 	if (dns_query_port == 0) {
 		kprintf("Could not bind DNS port! DNS queries will not resolve.\n");
 	}

src/net/net.c

@@ -95,7 +95,7 @@ uint32_t ntohl(uint32_t netlong) {
 
 void network_up()
 {
-	kprintf(" arp,");
+	kprintf(" ARP,");
 	arp_init();
 	kprintf(" IP,");
 	ip_init();

src/net/udp.c

@@ -1,6 +1,11 @@
 #include <kernel.h>
 
-static udp_daemon_handler daemons[USHRT_MAX] = { 0 };
+typedef struct {
+	udp_daemon_handler func;
+	void* opaque;
+} udp_daemon_registration;
+
+static udp_daemon_registration daemons[USHRT_MAX] = {};
 spinlock_t udp_lock = 0;
 #define UDP_MAX_PACKET (65536 + sizeof(udp_packet_t))
 
@@ -42,29 +47,30 @@ void udp_handle_packet([[maybe_unused]] ip_packet_t* encap_packet, udp_packet_t*
 	void * data_ptr = (void*)packet + sizeof(udp_packet_t);
 	uint32_t data_len = length;
 
-	if (daemons[dst_port] != NULL) {
-		daemons[dst_port](src_ip, src_port, dst_port, data_ptr, data_len);
+	if (daemons[dst_port].func != NULL) {
+		daemons[dst_port].func(src_ip, src_port, dst_port, data_ptr, data_len, daemons[dst_port].opaque);
 	}
 }
 
-uint16_t udp_register_daemon(uint16_t dst_port, udp_daemon_handler handler) {
+uint16_t udp_register_daemon(uint16_t dst_port, udp_daemon_handler handler, void* opaque) {
 
 	if (dst_port == 0) {
 		/* Let the OS allocate a port
 		 * Walk up the port table, looking for one that doesn't have
 		 * any daemon bound to it. If we wrap back around to 0, then
 		 * there are no free ports remaining to bind to.
 		 */
-		for(dst_port = 1024; daemons[dst_port] != NULL && dst_port != 0; ++dst_port);
+		for(dst_port = 1024; daemons[dst_port].func != NULL && dst_port != 0; ++dst_port);
 		if (dst_port == 0) {
 			return 0;
 		}
 	}
 
-	if (daemons[dst_port] != NULL && daemons[dst_port] != handler) {
+	if (daemons[dst_port].func != NULL && daemons[dst_port].func != handler) {
 		dprintf("*** BUG *** udp_register_daemon(%d) called twice!\n", dst_port);
 		return 0;
 	}
-	daemons[dst_port] = handler;
+	daemons[dst_port].func = handler;
+	daemons[dst_port].opaque = opaque;
 	return dst_port;
 }