Started libnet

3 files changed, 25 insertions, 73 deletions

diff --git a/kernel/features/net.c b/kernel/features/net.c
index 679f06a..01e8721 100644
--- a/kernel/features/net.c
+++ b/kernel/features/net.c
@@ -10,10 +10,10 @@
 #include <print.h>
 #include <random.h>
 #include <rtl8139.h>
+#include <socket.h>
 #include <str.h>
 #include <timer.h>
 
-static u32 dns_ip_addr = ip(1, 1, 1, 1);
 static u32 current_ip_addr = 0;
 static u32 gateway_addr = 0;
 static u32 subnet_mask = 0;
@@ -356,24 +356,6 @@ static void dhcp_request(void)
 	free(packet);
 }
 
-// TODO: Split name into tld etc automagically
-static void dns_make_packet(struct dns_packet *packet, const char *name, const char *tld);
-static void dns_request(const char *name, const char *tld)
-{
-	struct socket *socket = net_open(S_UDP);
-	if (socket)
-		socket->src_port = DNS_PORT;
-	if (!socket || !net_connect(socket, dns_ip_addr, 53))
-		return;
-
-	u32 length = sizeof(struct dns_packet) + strlen(name) + strlen(tld) + 7; // TODO: 7 :)
-	struct dns_packet *packet = malloc(length);
-	memset(packet, 0, length);
-	dns_make_packet(packet, name, tld);
-	net_send(socket, packet, length);
-	free(packet);
-}
-
 /**
  * Responses
  */
@@ -698,29 +680,6 @@ static int dhcp_discover(void)
 }
 
 /**
- * DNS
- */
-
-// TODO: Cleaner dns implementation
-static void dns_make_packet(struct dns_packet *packet, const char *name, const char *tld)
-{
-	packet->qid = htons(rand());
-	packet->flags = htons(0x0100); // Standard query
-	packet->questions = htons(1);
-	packet->answers = htons(0);
-	packet->authorities = htons(0);
-	packet->additional = htons(0);
-
-	packet->data[0] = (u8)strlen(name);
-	memcpy(&packet->data[1], name, (u8)strlen(name));
-	packet->data[(u8)strlen(name) + 1] = (u8)strlen(tld);
-	memcpy(&packet->data[(u8)strlen(name) + 2], tld, (u8)strlen(tld));
-	packet->data[(u8)strlen(name) + (u8)strlen(tld) + 2] = 0x00; // Name end
-	packet->data[(u8)strlen(name) + (u8)strlen(tld) + 4] = 0x01; // A
-	packet->data[(u8)strlen(name) + (u8)strlen(tld) + 6] = 0x01; // IN
-}
-
-/**
  * ARP
  */
 
@@ -861,13 +820,13 @@ void net_install(void)
 	}
 
 	// Request
-	dns_request("google", "de");
+	/* 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));
-	else
-		print("Couldn't connect!\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"); */
 
 	// Server // TODO: Serve using sockets
 	/* struct socket *socket2 = net_open(S_TCP); */
diff --git a/kernel/features/syscall.c b/kernel/features/syscall.c
index 63badd9..b601d96 100644
--- a/kernel/features/syscall.c
+++ b/kernel/features/syscall.c
@@ -6,6 +6,7 @@
 #include <interrupts.h>
 #include <load.h>
 #include <mem.h>
+#include <net.h>
 #include <print.h>
 #include <proc.h>
 #include <str.h>
@@ -91,6 +92,22 @@ void syscall_handler(struct regs *r)
 		r->eax = proc_current()->pid;
 		break;
 	}
+	case SYS_NET_OPEN: {
+		r->eax = (int)net_open(r->ebx);
+		break;
+	}
+	case SYS_NET_CLOSE: {
+		net_close((void *)r->ebx);
+		break;
+	}
+	case SYS_NET_CONNECT: {
+		r->eax = net_connect((void *)r->ebx, r->ecx, r->edx);
+		break;
+	}
+	case SYS_NET_SEND: {
+		net_send((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 1111f22..5630e97 100644
--- a/kernel/inc/net.h
+++ b/kernel/inc/net.h
@@ -4,6 +4,7 @@
 #define NET_H
 
 #include <def.h>
+#include <socket.h>
 
 #define htonl(l)                                                                                   \
 	((((l)&0xff) << 24) | (((l)&0xff00) << 8) | (((l)&0xff0000) >> 8) |                        \
@@ -164,31 +165,6 @@ struct arp_table_entry {
 	u64 mac_addr;
 };
 
-struct tcp_socket {
-	u32 seq_no;
-	u32 ack_no;
-	u32 state;
-};
-
-// TODO: Use actual socket types (stream etc)
-enum socket_type { S_TCP, S_UDP };
-enum socket_state { S_CONNECTING, S_CONNECTED, S_OPEN, S_CLOSED, S_FAILED };
-
-struct socket {
-	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;
-	union {
-		struct tcp_socket tcp;
-		/* struct udp_socket udp; */
-	} prot;
-};
-
 void ethernet_handle_packet(struct ethernet_packet *packet, int len);
 
 struct socket *net_open(enum socket_type type);