1 files changed, 28 insertions, 28 deletions

diff --git a/kernel/network/ipv4.c b/kernel/network/ipv4.c
index 7f480a3..891e74f 100644
--- a/kernel/network/ipv4.c
+++ b/kernel/network/ipv4.c
@@ -9,16 +9,16 @@
 #include <network/udp.h>
 #include <string.h>
 
-uint16_t ip_checksum(void *vdata, size_t length) {
+u16 ip_checksum(void *vdata, size_t length) {
   // Cast the data pointer to one that can be indexed.
   char *data = (char *)vdata;
 
   // Initialise the accumulator.
-  uint32_t acc = 0xffff;
+  u32 acc = 0xffff;
 
   // Handle complete 16-bit blocks.
   for (size_t i = 0; i + 1 < length; i += 2) {
-    uint16_t word;
+    u16 word;
     memcpy(&word, data + i, 2);
     acc += ntohs(word);
     if (acc > 0xffff) {
@@ -28,7 +28,7 @@ uint16_t ip_checksum(void *vdata, size_t length) {
 
   // Handle any partial block at the end of the data.
   if (length & 1) {
-    uint16_t word = 0;
+    u16 word = 0;
     memcpy(&word, data + length - 1, 1);
     acc += ntohs(word);
     if (acc > 0xffff) {
@@ -40,27 +40,27 @@ uint16_t ip_checksum(void *vdata, size_t length) {
   return htons(~acc);
 }
 
-extern uint8_t ip_address[4];
-void send_ipv4_packet(uint32_t ip, uint8_t protocol, const uint8_t *payload,
-                      uint16_t length) {
-  uint8_t header[20] = {0};
+extern u8 ip_address[4];
+void send_ipv4_packet(u32 ip, u8 protocol, const u8 *payload,
+                      u16 length) {
+  u8 header[20] = {0};
   header[0] = (4 /*version*/ << 4) | (5 /*IHL*/);
-  *((uint16_t *)(header + 2)) = htons(length + 20);
+  *((u16 *)(header + 2)) = htons(length + 20);
   header[8 /*TTL*/] = 0xF8;
   header[9] = protocol;
 
-  memcpy(header + 12 /*src_ip*/, ip_address, sizeof(uint8_t[4]));
-  memcpy(header + 16, &ip, sizeof(uint8_t[4]));
+  memcpy(header + 12 /*src_ip*/, ip_address, sizeof(u8[4]));
+  memcpy(header + 16, &ip, sizeof(u8[4]));
 
-  *((uint16_t *)(header + 10 /*checksum*/)) = ip_checksum(header, 20);
-  uint16_t packet_length = length + 20;
-  uint8_t *packet = kmalloc(packet_length);
+  *((u16 *)(header + 10 /*checksum*/)) = ip_checksum(header, 20);
+  u16 packet_length = length + 20;
+  u8 *packet = kmalloc(packet_length);
   memcpy(packet, header, 20);
   memcpy(packet + 20, payload, length);
 
-  uint8_t mac[6];
-  uint8_t ip_copy[4]; // TODO: Do I need to do this?
-  memcpy(ip_copy, &ip, sizeof(uint8_t[4]));
+  u8 mac[6];
+  u8 ip_copy[4]; // TODO: Do I need to do this?
+  memcpy(ip_copy, &ip, sizeof(u8[4]));
   for (; !get_mac_from_ip(ip_copy, mac);)
     ;
   kprintf("pre send_ethernet: %x\n", pit_num_ms());
@@ -69,29 +69,29 @@ void send_ipv4_packet(uint32_t ip, uint8_t protocol, const uint8_t *payload,
   kfree(packet);
 }
 
-void handle_ipv4(const uint8_t *payload, uint32_t packet_length) {
+void handle_ipv4(const u8 *payload, u32 packet_length) {
   assert(packet_length > 4);
 
-  uint16_t saved_checksum = *(uint16_t *)(payload + 10);
-  *(uint16_t *)(payload + 10) = 0;
-  uint16_t calc_checksum = ip_checksum((uint8_t *)payload, 20);
-  *(uint16_t *)(payload + 10) = saved_checksum;
+  u16 saved_checksum = *(u16 *)(payload + 10);
+  *(u16 *)(payload + 10) = 0;
+  u16 calc_checksum = ip_checksum((u8 *)payload, 20);
+  *(u16 *)(payload + 10) = saved_checksum;
   assert(calc_checksum == saved_checksum);
 
-  uint8_t version = (*payload & 0xF0) >> 4;
-  uint8_t IHL = (*payload & 0xF);
+  u8 version = (*payload & 0xF0) >> 4;
+  u8 IHL = (*payload & 0xF);
   kprintf("version: %x\n", version);
   assert(4 == version);
   assert(5 == IHL);
-  uint16_t ipv4_total_length = ntohs(*(uint16_t *)(payload + 2));
+  u16 ipv4_total_length = ntohs(*(u16 *)(payload + 2));
   assert(ipv4_total_length >= 20);
   // Make sure the ipv4 header is not trying to get uninitalized memory
   assert(ipv4_total_length <= packet_length);
 
-  uint8_t src_ip[4];
-  memcpy(src_ip, payload + 12, sizeof(uint8_t[4]));
+  u8 src_ip[4];
+  memcpy(src_ip, payload + 12, sizeof(u8[4]));
 
-  uint8_t protocol = *(payload + 9);
+  u8 protocol = *(payload + 9);
   switch (protocol) {
   case 0x6:
     handle_tcp(src_ip, payload + 20, ipv4_total_length - 20);