Added browser and many networking things

16 files changed, 302 insertions, 81 deletions

diff --git a/Makefile b/Makefile
index 4c67f3e..7276f3d 100644
--- a/Makefile
+++ b/Makefile
@@ -37,4 +37,4 @@ compile:
 	@echo "Compiled apps"
 
 clean:
-	@find kernel/ apps/ libc/ libtxt/ libgui/ boot/ \( -name "*.o" -or -name "*.a" -or -name "*.elf" -or -name "*.bin" \) -type f -delete
+	@find kernel/ apps/ libc/ libtxt/ libgui/ libnet/ boot/ \( -name "*.o" -or -name "*.a" -or -name "*.elf" -or -name "*.bin" \) -type f -delete
diff --git a/apps/Makefile b/apps/Makefile
index fd7cc99..ea212d9 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -1,6 +1,6 @@
 # MIT License, Copyright (c) 2020 Marvin Borner
 
-COBJS = init.o wm.o mandelbrot.o window.o exec.o files.o test.o cc.o
+COBJS = init.o wm.o mandelbrot.o window.o exec.o files.o test.o cc.o browser.o
 CC = ccache ../cross/opt/bin/i686-elf-gcc
 LD = ccache ../cross/opt/bin/i686-elf-ld
 OC = ccache ../cross/opt/bin/i686-elf-objcopy
diff --git a/apps/browser.c b/apps/browser.c
new file mode 100644
index 0000000..68a61c1
--- /dev/null
+++ b/apps/browser.c
@@ -0,0 +1,73 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+
+#include <conv.h>
+#include <def.h>
+#include <gfx.h>
+#include <gui.h>
+#include <input.h>
+#include <mem.h>
+#include <net.h>
+#include <print.h>
+#include <str.h>
+
+static struct element *root;
+static struct element *output;
+
+char *http_get(char *url)
+{
+	char *query = malloc(27 + strlen(url)); // TODO: Dynamic http length etc
+	query[0] = '\0';
+	strcat(query, "GET / HTTP/1.1\r\nHost: ");
+	strcat(query, url);
+	strcat(query, "\r\n\r\n");
+	return query;
+}
+
+// Temporary: Will be moved to libnet
+char **dns_split(char *url, char **buf)
+{
+	strchr(url, '.')[0] = '\0';
+	char *first = url;
+	char *second = url + strlen(url) + 1;
+	buf[0] = first;
+	buf[1] = second;
+
+	return buf;
+}
+
+void on_submit(void *event, struct element *box)
+{
+	(void)event;
+	char *url = ((struct element_text_input *)box->data)->text;
+	char *query = http_get(url);
+	char *dns[2];
+	dns_split(url, dns);
+	struct element_text_box *l = output->data;
+
+	struct socket *socket = net_open(S_TCP);
+	if (socket && net_connect(socket, dns_request(dns[0], dns[1]), 80)) {
+		net_send(socket, query, strlen(query));
+		u8 buf[4096] = { 0 };
+		net_receive(socket, buf, 4096);
+		l->text = (char *)buf;
+		gui_sync(root, output);
+	} else {
+		print("Couldn't connect!\n");
+	}
+	/* net_close(socket); */ // TODO: Fix net close before FIN/ACK got ACK'ed
+}
+
+int main()
+{
+	root = gui_init("browser", 600, 400, COLOR_BG);
+	struct element *text_input =
+		gui_add_text_input(root, 10, 10, 580, FONT_24, COLOR_WHITE, COLOR_BLACK);
+	output = gui_add_text_box(root, 10, 50, 580, 340, FONT_24, "Enter URL and press Enter :)",
+				  COLOR_WHITE, COLOR_BLACK);
+
+	text_input->event.on_submit = on_submit;
+
+	gui_event_loop(root);
+
+	return 0;
+}
diff --git a/apps/init.c b/apps/init.c
index 234853f..3cb4527 100644
--- a/apps/init.c
+++ b/apps/init.c
@@ -15,13 +15,5 @@ int main(int argc, char **argv)
 	int wm = exec("/bin/wm", "wm", argv[1], NULL);
 	int exec = exec("/bin/exec", "test", NULL);
 
-	/* #define http_req "GET / HTTP/1.1\r\nHost: google.de\r\n\r\n" */
-	/* 	struct socket *socket = net_open(S_TCP); */
-	/* 	if (socket && net_connect(socket, ip(91, 89, 253, 227), 80)) */
-	/* 		net_send(socket, strdup(http_req), strlen(http_req)); */
-	/* 	else */
-	/* 		print("Couldn't connect!\n"); */
-	dns_request("google", "de");
-
 	return wm + exec;
 }
diff --git a/kernel/features/net.c b/kernel/features/net.c
index 01e8721..b58c1da 100644
--- a/kernel/features/net.c
+++ b/kernel/features/net.c
@@ -374,23 +374,6 @@ static void icmp_handle_packet(struct icmp_packet *request_packet, u32 dst)
 	free(packet);
 }
 
-// TODO: Less magic numbers :)
-static void dns_handle_packet(struct dns_packet *packet)
-{
-	print("DNS!\n");
-	u16 flags = htons(packet->flags);
-	u8 reply_code = flags & 0xf;
-	if (reply_code != DNS_NOERROR) {
-		printf("DNS error: %d\n", reply_code);
-		return;
-	}
-
-	u8 *start = &packet->data[1] + strlen((char *)&packet->data[1]);
-	printf("TTL of %s: %ds\n", &packet->data[1], (u32)start[14]);
-	u8 *ip = &start[17];
-	printf("IP: %d.%d.%d.%d\n", ip[0], ip[1], ip[2], ip[3]);
-}
-
 static void dhcp_handle_packet(struct dhcp_packet *packet)
 {
 	print("DHCP!\n");
@@ -510,10 +493,16 @@ static void tcp_handle_packet(struct tcp_packet *packet, u32 dst, int len)
 		tcp->state++;
 		return;
 	} else if (tcp->state == 6 && (flags & 0xff) == (TCP_FLAG_ACK | TCP_FLAG_PSH)) {
-		for (u32 i = 0; i < data_length; ++i) {
-			if (packet->data[i])
-				printf("%c", packet->data[i]);
+		struct socket_data *sdata = malloc(sizeof(*sdata));
+		sdata->length = data_length;
+		if (sdata->length) {
+			sdata->data = malloc(data_length);
+			memcpy(sdata->data, packet->data, data_length);
+		} else {
+			sdata->data = NULL;
 		}
+		list_add(socket->packets, sdata);
+		proc_from_pid(socket->pid)->state = PROC_RUNNING;
 
 		tcp->ack_no += data_length;
 		tcp->seq_no = recv_ack;
@@ -539,14 +528,11 @@ static void udp_handle_packet(struct udp_packet *packet)
 {
 	printf("UDP Port: %d\n", ntohs(packet->dst_port));
 
-	void *data_ptr = (u8 *)packet + sizeof(*packet);
+	void *data_ptr = packet->data;
 
 	if (ntohs(packet->dst_port) == DHCP_PORT) {
 		dhcp_handle_packet(data_ptr);
 		return;
-	} else if (ntohs(packet->dst_port) == DNS_PORT) {
-		dns_handle_packet(data_ptr);
-		return;
 	}
 
 	struct socket *socket = NULL;
@@ -557,7 +543,16 @@ static void udp_handle_packet(struct udp_packet *packet)
 	}
 
 	// TODO: Socket event to process
-	(void)socket;
+	struct socket_data *sdata = malloc(sizeof(*sdata));
+	sdata->length = ntohs(packet->length);
+	if (sdata->length) {
+		sdata->data = malloc(sdata->length);
+		memcpy(sdata->data, packet->data, sdata->length);
+	} else {
+		sdata->data = NULL;
+	}
+	list_add(socket->packets, sdata);
+	proc_from_pid(socket->pid)->state = PROC_RUNNING;
 }
 
 static void ip_handle_packet(struct ip_packet *packet, int len)
@@ -716,6 +711,8 @@ struct socket *net_open(enum socket_type type)
 
 	socket->type = type;
 	socket->state = S_OPEN;
+	socket->packets = list_new();
+	socket->pid = proc_current()->pid;
 	return socket;
 }
 
@@ -727,7 +724,7 @@ void net_close(struct socket *socket)
 
 int net_connect(struct socket *socket, u32 ip_addr, u16 dst_port)
 {
-	if (!socket || socket->state != S_OPEN)
+	if (!socket || socket->state != S_OPEN || !ip_addr || !dst_port)
 		return 0;
 
 	socket->ip_addr = ip_addr;
@@ -741,6 +738,7 @@ int net_connect(struct socket *socket, u32 ip_addr, u16 dst_port)
 		socket->prot.tcp.ack_no = 0;
 		socket->prot.tcp.state = 0;
 		socket->state = S_CONNECTING;
+		// TODO: Don't block kernel
 		tcp_send_packet(socket, TCP_FLAG_SYN, NULL, 0);
 		sti();
 		u32 time = timer_get();
@@ -776,6 +774,37 @@ void net_send(struct socket *socket, void *data, u32 len)
 	}
 }
 
+int net_data_available(struct socket *socket)
+{
+	if (socket && socket->packets && socket->packets->head &&
+	    ((struct socket_data *)socket->packets->head->data)->length > 0)
+		return 1;
+	else
+		return 0;
+}
+
+int net_receive(struct socket *socket, void *buf, u32 len)
+{
+	if (!socket || !socket->packets)
+		return 0;
+
+	u32 offset = 0;
+	struct node *iterator = socket->packets->head;
+	while (iterator != NULL) {
+		struct socket_data *sdata = iterator->data;
+		u32 length = sdata->length;
+		if (offset + length < len) {
+			memcpy((u8 *)buf + offset, sdata->data, length);
+			offset += length;
+		} else {
+			break;
+		};
+		iterator = iterator->next;
+	}
+
+	return offset;
+}
+
 /**
  * Install
  */
@@ -820,8 +849,6 @@ void net_install(void)
 	}
 
 	// Request
-	/* dns_request("google", "de"); */
-
 	/* struct socket *socket = net_open(S_TCP); */
 	/* if (socket && net_connect(socket, ip(91, 89, 253, 227), 80)) */
 	/* 	net_send(socket, strdup(http_req), strlen(http_req)); */
diff --git a/kernel/features/proc.c b/kernel/features/proc.c
index 76f552b..ffe0af0 100644
--- a/kernel/features/proc.c
+++ b/kernel/features/proc.c
@@ -36,14 +36,18 @@ void scheduler(struct regs *regs)
 	if (current)
 		memcpy(&((struct proc *)current->data)->regs, regs, sizeof(struct regs));
 
-	if (priority_proc) {
+	if (priority_proc && priority_proc->state == PROC_RUNNING) {
 		current = list_first_data(proc_list, priority_proc);
 		priority_proc = NULL;
 		assert(current);
-	} else if (current && current->next) {
+	} else if (current && current->next &&
+		   ((struct proc *)current->next->data)->state == PROC_RUNNING) {
 		current = current->next;
-	} else {
+	} else if (((struct proc *)proc_list->head->data)->state == PROC_RUNNING) {
 		current = proc_list->head;
+	} else {
+		print("TODO: All processes are sleeping!\n"); // TODO!
+		/* loop(); */
 	}
 
 	memcpy(regs, &((struct proc *)current->data)->regs, sizeof(struct regs));
diff --git a/kernel/features/syscall.c b/kernel/features/syscall.c
index b601d96..3ee5a82 100644
--- a/kernel/features/syscall.c
+++ b/kernel/features/syscall.c
@@ -108,6 +108,14 @@ void syscall_handler(struct regs *r)
 		net_send((void *)r->ebx, (void *)r->ecx, r->edx);
 		break;
 	}
+	case SYS_NET_RECEIVE: {
+		if (!net_data_available((void *)r->ebx)) {
+			proc_current()->state = PROC_SLEEPING;
+			proc_yield(r);
+		}
+		r->eax = net_receive((void *)r->ebx, (void *)r->ecx, r->edx);
+		break;
+	}
 	default: {
 		print("Unknown syscall!\n");
 		break;
diff --git a/kernel/inc/net.h b/kernel/inc/net.h
index 5630e97..0c36691 100644
--- a/kernel/inc/net.h
+++ b/kernel/inc/net.h
@@ -40,17 +40,6 @@
 #define DHCP_REPLY 2
 #define DHCP_TRANSACTION_IDENTIFIER 0x18122002
 
-#define DNS_NOERROR 0
-#define DNS_FORMERR 1
-#define DNS_SERVFAIL 2
-#define DNS_NXDOMAIN 3
-#define DNS_NOTIMP 4
-#define DNS_REFUSED 5
-#define DNS_YXDOMAIN 6
-#define DNS_XRRSET 7
-#define DNS_NOTAUTH 8
-#define DNS_NOTZONE 9
-
 #define HARDWARE_TYPE_ETHERNET 0x01
 
 // Hardcoded ports - TODO!
@@ -171,6 +160,8 @@ struct socket *net_open(enum socket_type type);
 void net_close(struct socket *socket);
 int net_connect(struct socket *socket, u32 ip_addr, u16 dst_port);
 void net_send(struct socket *socket, void *data, u32 len);
+int net_receive(struct socket *socket, void *buf, u32 len);
+int net_data_available(struct socket *socket);
 
 void net_install(void);
 
diff --git a/kernel/inc/proc.h b/kernel/inc/proc.h
index ad95104..dc12369 100644
--- a/kernel/inc/proc.h
+++ b/kernel/inc/proc.h
@@ -17,7 +17,7 @@
 #define GDT_USER_CODE_OFFSET 0x1b // User code segment offset in GDT (with ring3 mask)
 #define GDT_USER_DATA_OFFSET 0x23 // User data segment offset in GDT (with ring3 mask)
 
-enum proc_state { PROC_RUNNING };
+enum proc_state { PROC_RUNNING, PROC_SLEEPING };
 
 struct proc {
 	u32 pid;
diff --git a/libc/inc/socket.h b/libc/inc/socket.h
index 651bba0..e5e23ad 100644
--- a/libc/inc/socket.h
+++ b/libc/inc/socket.h
@@ -4,6 +4,7 @@
 #define SOCKET_H
 
 #include <def.h>
+#include <list.h>
 
 // TODO: Use actual socket types (stream etc)
 enum socket_type { S_TCP, S_UDP };
@@ -15,15 +16,19 @@ struct tcp_socket {
 	u32 state;
 };
 
+struct socket_data {
+	u8 *data;
+	u32 length;
+};
+
 struct socket {
+	u32 pid;
 	u32 ip_addr;
 	u32 dst_port;
 	u32 src_port;
 	enum socket_state state;
 	enum socket_type type;
-	u32 bytes_available;
-	u32 bytes_read;
-	void *current_packet;
+	struct list *packets;
 	union {
 		struct tcp_socket tcp;
 		/* struct udp_socket udp; */
diff --git a/libc/inc/sys.h b/libc/inc/sys.h
index 4e52ac1..42b1c8a 100644
--- a/libc/inc/sys.h
+++ b/libc/inc/sys.h
@@ -26,6 +26,7 @@ enum sys {
 	SYS_NET_CLOSE, // Close network socket
 	SYS_NET_CONNECT, // Connect to destination
 	SYS_NET_SEND, // Send to socket
+	SYS_NET_RECEIVE, // Receive data from socket
 };
 
 enum event_type { EVENT_KEYBOARD, EVENT_MOUSE, EVENT_MAX };
diff --git a/libgui/gfx.c b/libgui/gfx.c
index 304f935..74f0138 100644
--- a/libgui/gfx.c
+++ b/libgui/gfx.c
@@ -105,8 +105,16 @@ void gfx_write_char(struct context *ctx, int x, int y, enum font_type font_type,
 void gfx_write(struct context *ctx, int x, int y, enum font_type font_type, u32 c, char *text)
 {
 	struct font *font = gfx_resolve_font(font_type);
+	u32 cnt = 0;
 	for (u32 i = 0; i < strlen(text); i++) {
-		write_char(ctx, x + i * font->width, y, font, c, text[i]);
+		// TODO: Should this be here?
+		if (text[i] == '\n') {
+			cnt = 0;
+			y += font->height;
+		} else {
+			write_char(ctx, x + cnt * font->width, y, font, c, text[i]);
+		}
+		cnt++;
 	}
 	/* gfx_redraw(); */
 }
diff --git a/libgui/gui.c b/libgui/gui.c
index fe78883..c3369bb 100644
--- a/libgui/gui.c
+++ b/libgui/gui.c
@@ -147,6 +147,13 @@ void gui_sync_label(struct element *elem)
 	gfx_write(elem->ctx, 0, 0, label->font_type, label->color_fg, label->text);
 }
 
+void gui_sync_text_box(struct element *elem)
+{
+	struct element_text_box *text_box = elem->data;
+	gfx_fill(elem->ctx, text_box->color_bg);
+	gfx_write(elem->ctx, 0, 0, text_box->font_type, text_box->color_fg, text_box->text);
+}
+
 void gui_sync_text_input(struct element *elem)
 {
 	struct element_text_input *text_input = elem->data;
@@ -161,8 +168,33 @@ void gui_sync_container(struct element *elem)
 	// TODO: Handle container flags
 }
 
+void gui_sync(struct element *container, struct element *elem)
+{
+	switch (elem->type) {
+	case GUI_TYPE_BUTTON:
+		gui_sync_button(elem);
+		break;
+	case GUI_TYPE_LABEL:
+		gui_sync_label(elem);
+		break;
+	case GUI_TYPE_TEXT_BOX:
+		gui_sync_text_box(elem);
+		break;
+	case GUI_TYPE_TEXT_INPUT:
+		gui_sync_text_input(elem);
+		break;
+	case GUI_TYPE_CONTAINER:
+		gui_sync_container(elem);
+		break;
+	default:
+		break;
+	}
+	merge_elements(get_root(container->window_id));
+	gfx_redraw_focused();
+}
+
 struct element *gui_add_button(struct element *container, int x, int y, enum font_type font_type,
-			       char *text, u32 color_bg, u32 color_fg)
+			       const char *text, u32 color_bg, u32 color_fg)
 {
 	if (!container || !container->childs || !gfx_resolve_font(font_type))
 		return NULL;
@@ -178,22 +210,20 @@ struct element *gui_add_button(struct element *container, int x, int y, enum fon
 	button->ctx->flags = WF_RELATIVE;
 	button->childs = list_new();
 	button->data = malloc(sizeof(struct element_button));
-	((struct element_button *)button->data)->text = text;
+	((struct element_button *)button->data)->text = strdup(text);
 	((struct element_button *)button->data)->color_fg = color_fg;
 	((struct element_button *)button->data)->color_bg = color_bg;
 	((struct element_button *)button->data)->font_type = font_type;
 
 	gfx_new_ctx(button->ctx);
 	list_add(container->childs, button);
-	gui_sync_button(button);
-	merge_elements(get_root(container->window_id));
-	gfx_redraw_focused();
+	gui_sync(container, button);
 
 	return button;
 }
 
 struct element *gui_add_label(struct element *container, int x, int y, enum font_type font_type,
-			      char *text, u32 color_bg, u32 color_fg)
+			      const char *text, u32 color_bg, u32 color_fg)
 {
 	if (!container || !container->childs || !gfx_resolve_font(font_type))
 		return NULL;
@@ -209,20 +239,48 @@ struct element *gui_add_label(struct element *container, int x, int y, enum font
 	label->ctx->flags = WF_RELATIVE;
 	label->childs = list_new();
 	label->data = malloc(sizeof(struct element_label));
-	((struct element_label *)label->data)->text = text;
+	((struct element_label *)label->data)->text = strdup(text);
 	((struct element_label *)label->data)->color_fg = color_fg;
 	((struct element_label *)label->data)->color_bg = color_bg;
 	((struct element_label *)label->data)->font_type = font_type;
 
 	gfx_new_ctx(label->ctx);
 	list_add(container->childs, label);
-	gui_sync_label(label);
-	merge_elements(get_root(container->window_id));
-	gfx_redraw_focused();
+	gui_sync(container, label);
 
 	return label;
 }
 
+struct element *gui_add_text_box(struct element *container, int x, int y, u32 width, u32 height,
+				 enum font_type font_type, const char *text, u32 color_bg,
+				 u32 color_fg)
+{
+	if (!container || !container->childs || !gfx_resolve_font(font_type))
+		return NULL;
+
+	struct element *text_box = malloc(sizeof(*text_box));
+	text_box->type = GUI_TYPE_TEXT_BOX;
+	text_box->window_id = container->window_id;
+	text_box->ctx = malloc(sizeof(*text_box->ctx));
+	text_box->ctx->x = x;
+	text_box->ctx->y = y;
+	text_box->ctx->width = width;
+	text_box->ctx->height = height;
+	text_box->ctx->flags = WF_RELATIVE;
+	text_box->childs = list_new();
+	text_box->data = malloc(sizeof(struct element_text_box));
+	((struct element_text_box *)text_box->data)->text = strdup(text);
+	((struct element_text_box *)text_box->data)->color_fg = color_fg;
+	((struct element_text_box *)text_box->data)->color_bg = color_bg;
+	((struct element_text_box *)text_box->data)->font_type = font_type;
+
+	gfx_new_ctx(text_box->ctx);
+	list_add(container->childs, text_box);
+	gui_sync(container, text_box);
+
+	return text_box;
+}
+
 struct element *gui_add_text_input(struct element *container, int x, int y, u32 width,
 				   enum font_type font_type, u32 color_bg, u32 color_fg)
 {
@@ -246,9 +304,7 @@ struct element *gui_add_text_input(struct element *container, int x, int y, u32
 
 	gfx_new_ctx(text_input->ctx);
 	list_add(container->childs, text_input);
-	gui_sync_text_input(text_input);
-	merge_elements(get_root(container->window_id));
-	gfx_redraw_focused();
+	gui_sync(container, text_input);
 
 	return text_input;
 }
@@ -275,9 +331,7 @@ struct element *gui_add_container(struct element *container, int x, int y, u32 w
 
 	gfx_new_ctx(new_container->ctx);
 	list_add(container->childs, new_container);
-	gui_sync_container(new_container);
-	merge_elements(get_root(container->window_id));
-	gfx_redraw_focused();
+	gui_sync(container, new_container);
 
 	return new_container;
 }
diff --git a/libgui/inc/gui.h b/libgui/inc/gui.h
index 90e07ae..ec5da95 100644
--- a/libgui/inc/gui.h
+++ b/libgui/inc/gui.h
@@ -19,6 +19,7 @@ enum element_type {
 	GUI_TYPE_CONTAINER,
 	GUI_TYPE_BUTTON,
 	GUI_TYPE_LABEL,
+	GUI_TYPE_TEXT_BOX,
 	GUI_TYPE_TEXT_INPUT
 };
 
@@ -49,6 +50,13 @@ struct element_label {
 	enum font_type font_type;
 };
 
+struct element_text_box {
+	char *text;
+	u32 color_fg;
+	u32 color_bg;
+	enum font_type font_type;
+};
+
 struct element_text_input {
 	char text[MAX_INPUT_LENGTH];
 	u32 color_fg;
@@ -90,13 +98,17 @@ struct gui_event_mouse {
 struct element *gui_init(const char *title, u32 width, u32 height, u32 color_bg);
 void gui_event_loop(struct element *container);
 struct element *gui_add_button(struct element *container, int x, int y, enum font_type font_type,
-			       char *text, u32 color_bg, u32 color_fg);
+			       const char *text, u32 color_bg, u32 color_fg);
 struct element *gui_add_label(struct element *container, int x, int y, enum font_type font_type,
-			      char *text, u32 color_bg, u32 color_fg);
+			      const char *text, u32 color_bg, u32 color_fg);
+struct element *gui_add_text_box(struct element *container, int x, int y, u32 width, u32 height,
+				 enum font_type font_type, const char *text, u32 color_bg,
+				 u32 color_fg);
 struct element *gui_add_text_input(struct element *container, int x, int y, u32 width,
 				   enum font_type font_type, u32 color_bg, u32 color_fg);
 struct element *gui_add_container(struct element *container, int x, int y, u32 width, u32 height,
 				  u32 color_bg);
+void gui_sync(struct element *container, struct element *elem);
 void gui_remove_childs(struct element *elem);
 void gui_remove_element(struct element *elem);
 
diff --git a/libnet/dns.c b/libnet/dns.c
index b35eb72..fc6b06f 100644
--- a/libnet/dns.c
+++ b/libnet/dns.c
@@ -1,7 +1,11 @@
 // MIT License, Copyright (c) 2020 Marvin Borner
+// TODO: Less magic, auto xld splitting
+// TODO: DNS cache
 
 #include <def.h>
 #include <mem.h>
+#include <net.h>
+#include <print.h>
 #include <random.h>
 #include <socket.h>
 #include <str.h>
@@ -36,13 +40,29 @@ static void dns_make_packet(struct dns_packet *packet, const char *name, const c
 	packet->data[(u8)strlen(name) + (u8)strlen(tld) + 6] = 0x01; // IN
 }
 
-void dns_request(const char *name, const char *tld)
+static u32 dns_handle_packet(struct dns_packet *packet)
+{
+	u16 flags = htons(packet->flags);
+	u8 reply_code = flags & 0xf;
+	if (reply_code != DNS_NOERROR) {
+		printf("DNS error: %d\n", reply_code);
+		return 0;
+	}
+
+	u8 *start = &packet->data[1] + strlen((char *)&packet->data[1]);
+	printf("TTL of %s: %ds\n", &packet->data[1], (u32)start[14]);
+	u8 *ip = &start[17];
+	printf("IP: %d.%d.%d.%d\n", ip[0], ip[1], ip[2], ip[3]);
+	return ip(ip[0], ip[1], ip[2], ip[3]);
+}
+
+u32 dns_request(const char *name, const char *tld)
 {
 	struct socket *socket = net_open(S_UDP);
-	if (socket)
-		socket->src_port = 50053;
+	/* if (socket) */
+	/* 	socket->src_port = 50053; */
 	if (!socket || !net_connect(socket, dns_ip_addr, 53))
-		return;
+		return 0;
 
 	u32 length = sizeof(struct dns_packet) + strlen(name) + strlen(tld) + 7; // TODO: 7 :)
 	struct dns_packet *packet = malloc(length);
@@ -50,4 +70,11 @@ void dns_request(const char *name, const char *tld)
 	dns_make_packet(packet, name, tld);
 	net_send(socket, packet, length);
 	free(packet);
+
+	u8 buf[128] = { 0 };
+	int l = net_receive(socket, buf, 128);
+	if (l > 0)
+		return dns_handle_packet((void *)buf);
+	else
+		return 0;
 }
diff --git a/libnet/inc/net.h b/libnet/inc/net.h
index 836e181..fa4284c 100644
--- a/libnet/inc/net.h
+++ b/libnet/inc/net.h
@@ -4,6 +4,18 @@
 #define NET_H
 
 #include <socket.h>
+#include <sys.h>
+
+#define DNS_NOERROR 0
+#define DNS_FORMERR 1
+#define DNS_SERVFAIL 2
+#define DNS_NXDOMAIN 3
+#define DNS_NOTIMP 4
+#define DNS_REFUSED 5
+#define DNS_YXDOMAIN 6
+#define DNS_XRRSET 7
+#define DNS_NOTAUTH 8
+#define DNS_NOTZONE 9
 
 #define htonl(l)                                                                                   \
 	((((l)&0xff) << 24) | (((l)&0xff00) << 8) | (((l)&0xff0000) >> 8) |                        \
@@ -15,11 +27,18 @@
 	((((a)&0xff) << 24) | (((b)&0xff) << 16) | (((c)&0xff) << 8) | (((d)&0xff) << 0))
 
 #define net_open(type) (void *)sys1(SYS_NET_OPEN, (int)(type))
-#define net_close(socket) (void)sys1(SYS_NET_CLOSE, (int)(type))
+#define net_close(socket) (void)sys1(SYS_NET_CLOSE, (int)(socket))
 #define net_connect(socket, ip_addr, dst_port)                                                     \
 	(int)sys3(SYS_NET_CONNECT, (int)(socket), (int)(ip_addr), (int)(dst_port))
 #define net_send(socket, data, len) (void)sys3(SYS_NET_SEND, (int)(socket), (int)(data), (int)(len))
+static inline int net_receive(struct socket *socket, void *buf, u32 len)
+{
+	int res = 0;
+	while ((res = (int)sys3(SYS_NET_RECEIVE, (int)(socket), (int)(buf), (int)(len))) == 0)
+		;
+	return res;
+}
 
-void dns_request(const char *name, const char *tld);
+u32 dns_request(const char *name, const char *tld);
 
 #endif