New (working!) network approach

4 files changed, 43 insertions, 71 deletions

diff --git a/kernel/drivers/rtl8139.c b/kernel/drivers/rtl8139.c
index c901892..2dd0453 100644
--- a/kernel/drivers/rtl8139.c
+++ b/kernel/drivers/rtl8139.c
@@ -69,6 +69,7 @@ void rtl8139_find(u32 device, u16 vendor_id, u16 device_id, void *extra)
 	}
 }
 
+// TODO: Fix late packet arrival
 void rtl8139_irq_handler()
 {
 	if (!rtl_device_pci)
@@ -79,6 +80,7 @@ void rtl8139_irq_handler()
 
 	if (status & RTL_TOK) {
 		print("Sent packet\n");
+		rtl8139_receive_packet();
 	} else if (status & RTL_ROK) {
 		rtl8139_receive_packet();
 	}
diff --git a/kernel/features/net.c b/kernel/features/net.c
index 7430441..447d781 100644
--- a/kernel/features/net.c
+++ b/kernel/features/net.c
@@ -9,8 +9,9 @@
 #include <rtl8139.h>
 #include <str.h>
 
-static u32 is_ip_allocated = 0;
-static u32 ip_addr = 0x0e0014ac;
+static u32 ip_addr = 0x0f02000a;
+static u32 gateway_addr = 0x0202000a;
+static u8 gateway_mac[6] = { 0 };
 
 /**
  * Helper functions
@@ -18,16 +19,17 @@ static u32 ip_addr = 0x0e0014ac;
 
 u16 ip_calculate_checksum(struct ip_packet *packet)
 {
+	int array_size = sizeof(struct ip_packet) / 2;
+	u16 *array = (u16 *)packet;
 	u32 sum = 0;
-	u16 *s = (u16 *)packet;
-
-	for (int i = 0; i < 10; i++)
-		sum += ntohs(s[i]);
-
-	if (sum > 0xFFFF)
-		sum = (sum >> 16) + (sum & 0xFFFF);
-
-	return sum;
+	for (int i = 0; i < array_size; i++) {
+		sum += htons(array[i]);
+	}
+	u32 carry = sum >> 16;
+	sum = sum & 0x0000ffff;
+	sum = sum + carry;
+	u16 ret = ~sum;
+	return ret;
 }
 
 u16 icmp_calculate_checksum(struct icmp_packet *packet)
@@ -104,7 +106,7 @@ void ip_send_packet(u32 dst, void *data, int len, int prot)
 	memset(packet, 0, sizeof(*packet));
 	packet->version_ihl = ((0x4 << 4) | (0x5 << 0));
 	packet->length = sizeof(*packet) + len;
-	packet->id = 0; // TODO: IP fragmentation
+	packet->id = htons(1); // TODO: IP fragmentation
 	packet->ttl = 64;
 	packet->protocol = prot;
 	packet->src = ip_addr;
@@ -150,13 +152,13 @@ void udp_send_packet(u32 dst, u16 src_port, u16 dst_port, void *data, int len)
 	free(packet);
 }
 
-void dhcp_make_packet(struct dhcp_packet *packet, u8 msg_type, u32 request_ip);
-void dhcp_request(u32 request_ip)
+void dhcp_make_packet(struct dhcp_packet *packet, u8 msg_type);
+void dhcp_request()
 {
 	u32 dst = 0xffffffff;
 	struct dhcp_packet *packet = malloc(sizeof(*packet));
 	memset(packet, 0, sizeof(*packet));
-	dhcp_make_packet(packet, 3, request_ip);
+	dhcp_make_packet(packet, 3);
 	udp_send_packet(dst, 68, 67, packet, sizeof(*packet));
 	free(packet);
 }
@@ -184,11 +186,11 @@ void dhcp_handle_packet(struct dhcp_packet *packet)
 	print("DHCP!\n");
 	if (packet->op == DHCP_REPLY) {
 		u8 *type = dhcp_get_options(packet, 53);
-		if (*type == 2) {
-			dhcp_request(packet->your_ip);
-		} else if (*type == 5) {
+		if (*type == 2) { // Offer
+			print("DHCP offer\n");
+			dhcp_request();
+		} else if (*type == 5) { // ACK
 			ip_addr = packet->your_ip;
-			is_ip_allocated = 1;
 			printf("ACK! %x\n", ip_addr);
 		}
 		free(type);
@@ -198,7 +200,7 @@ void dhcp_handle_packet(struct dhcp_packet *packet)
 void udp_handle_packet(struct udp_packet *packet)
 {
 	printf("UDP Port: %d\n", ntohs(packet->dst_port));
-	void *data_ptr = (u32 *)packet + sizeof(*packet);
+	void *data_ptr = (u8 *)packet + sizeof(*packet);
 
 	if (ntohs(packet->dst_port) == 68)
 		dhcp_handle_packet(data_ptr);
@@ -277,15 +279,15 @@ void ethernet_handle_packet(struct ethernet_packet *packet, int len)
  * DHCP
  */
 
-void dhcp_make_packet(struct dhcp_packet *packet, u8 msg_type, u32 request_ip)
+void dhcp_make_packet(struct dhcp_packet *packet, u8 msg_type)
 {
 	packet->op = DHCP_REQUEST;
 	packet->hardware_type = HARDWARE_TYPE_ETHERNET;
-	packet->hardware_addr_len = 6;
+	packet->mac_len = 6;
 	packet->hops = 0;
-	packet->xid = htonl(DHCP_TRANSACTION_IDENTIFIER);
-	packet->flags = htons(0x8000);
-	memcpy(packet->client_hardware_addr, rtl8139_get_mac(), 6);
+	packet->xid = htonl(0x41c6);
+	packet->flags = htons(0x0001);
+	memcpy(packet->client_mac, rtl8139_get_mac(), 6);
 
 	// Magic Cookie
 	u8 *options = packet->options;
@@ -297,37 +299,7 @@ void dhcp_make_packet(struct dhcp_packet *packet, u8 msg_type, u32 request_ip)
 	*(options++) = 1;
 	*(options++) = msg_type;
 
-	// Client identifier
-	*(options++) = 61;
-	*(options++) = 0x07;
-	*(options++) = 0x01;
-	memcpy(options, rtl8139_get_mac(), 6);
-	options += 6;
-
-	// Requested IP address
-	*(options++) = 50;
-	*(options++) = 0x04;
-	*((u32 *)(options)) = request_ip;
-	options += 4;
-
-	// Host Name
-	*(options++) = 12;
-	*(options++) = 0x07;
-	memcpy(options, "melvix", strlen("melvix"));
-	options += strlen("melvix");
-	*(options++) = 0x00;
-
-	// Parameter request list
-	*(options++) = 55;
-	*(options++) = 8;
-	*(options++) = 0x1;
-	*(options++) = 0x3;
-	*(options++) = 0x6;
-	*(options++) = 0xf;
-	*(options++) = 0x2c;
-	*(options++) = 0x2e;
-	*(options++) = 0x2f;
-	*(options++) = 0x39;
+	// End
 	*(options++) = 0xff;
 }
 
@@ -337,7 +309,7 @@ void dhcp_discover()
 	u32 dst_ip = 0xffffffff;
 	struct dhcp_packet *packet = malloc(sizeof(*packet));
 	memset(packet, 0, sizeof(*packet));
-	dhcp_make_packet(packet, 1, 0);
+	dhcp_make_packet(packet, 1);
 	udp_send_packet(dst_ip, 68, 67, packet, sizeof(*packet));
 	free(packet);
 }
@@ -374,7 +346,14 @@ int arp_lookup(u8 *ret_hardware_addr, u32 ip_addr)
 void net_install()
 {
 	if (rtl8139_install()) {
-		arp_lookup_add(broadcast_mac, 0xffffffff);
+		sti();
+		arp_send_packet(broadcast_mac, gateway_addr, ARP_REQUEST);
+		print("Waiting for gateway answer...\n");
+		while (!arp_lookup(gateway_mac, gateway_addr))
+			hlt(); // TODO: Add ARP timeout
+		print("Found gateway!\n");
+
+		arp_lookup_add(gateway_mac, 0xffffffff);
 		dhcp_discover();
 	}
 }
diff --git a/kernel/inc/net.h b/kernel/inc/net.h
index 765e035..78aed51 100644
--- a/kernel/inc/net.h
+++ b/kernel/inc/net.h
@@ -67,7 +67,7 @@ struct ip_packet {
 struct dhcp_packet {
 	u8 op;
 	u8 hardware_type;
-	u8 hardware_addr_len;
+	u8 mac_len;
 	u8 hops;
 	u32 xid;
 	u16 seconds;
@@ -76,7 +76,8 @@ struct dhcp_packet {
 	u32 your_ip;
 	u32 server_ip;
 	u32 gateway_ip;
-	u8 client_hardware_addr[16];
+	u8 client_mac[6];
+	u8 reserved[10];
 	u8 server_name[64];
 	u8 file[128];
 	u8 options[64];
diff --git a/run b/run
index f4434e6..f3ed4c2 100755
--- a/run
+++ b/run
@@ -26,7 +26,7 @@ no_ask="${2}"
 qemu_with_flags() {
     if [ -z "$network" ]; then network="rtl8139"; fi
     if [ "$network" != "false" ] && [ "$mode" = "net" ]; then
-        qemu-system-i386 -cpu max -no-reboot -vga std -rtc base=localtime -m 256M -smp 4 -netdev tap,id=net0,ifname=tap0,script=no,downscript=no -device $network,netdev=net0,id=nic0 -object filter-dump,id=nic0,netdev=net0,file=dump.pcap "$@"
+        qemu-system-i386 -cpu max -no-reboot -vga std -rtc base=localtime -m 256M -smp 4 -netdev user,id=net0,hostfwd=tcp:127.0.0.1:8000-10.0.2.15:8000 -device $network,netdev=net0 -object filter-dump,id=dump,netdev=net0,file=dump.pcap "$@"
     else
         qemu-system-i386 -cpu max -no-reboot -vga std -rtc base=localtime -m 256M -smp 4 "$@"
     fi
@@ -168,16 +168,6 @@ make_build() {
 }
 
 make_test() {
-    if [ "$mode" = "net" ]; then
-        brctl show br0 &>/dev/null || (
-            sudo brctl addbr br0
-            sudo brctl addif br0 enp8s0
-            sudo ip tuntap add tap0 mode tap
-            sudo ip link set br0 up
-            sudo ip link set tap0 up
-        )
-    fi
-
     if [ "$mode" = "test" ]; then
         qemu_with_flags -serial file:test.log -nographic -drive file=build/disk.img,format=raw,index=1,media=disk
         echo