Kernel/Networking/LibC: Add syscalls and libc functions for UDP

This allows a UDP server to be created in userland and read data.
Currently it can't send data and is very very simplistic.

Code is horrible and probably needs some fixing until it can be further built
upon.

1 files changed, 68 insertions, 38 deletions

diff --git a/socket.c b/socket.c
index 59f86bf..4ef4b3a 100644
--- a/socket.c
+++ b/socket.c
@@ -1,3 +1,4 @@
+#include <assert.h>
 #include <errno.h>
 #include <fs/devfs.h>
 #include <fs/tmpfs.h>
@@ -5,7 +6,19 @@
 #include <sched/scheduler.h>
 #include <socket.h>
 
+// FIXME: Make these more dynamic
 OPEN_UNIX_SOCKET *un_sockets[100] = {0};
+OPEN_INET_SOCKET *inet_sockets[100] = {0};
+
+OPEN_INET_SOCKET *find_open_udp_port(uint16_t port) {
+  for (int i = 0; i < 100; i++) {
+    if (!inet_sockets[i])
+      continue;
+    if (inet_sockets[i]->port == port)
+      return inet_sockets[i];
+  }
+  return NULL;
+}
 
 int uds_open(const char *path) {
   // FIXME: This is super ugly
@@ -35,8 +48,8 @@ int uds_open(const char *path) {
   dual_pipe(fd);
 
   char c = 'i';
-  raw_vfs_pwrite(s->ptr_fifo_fd, &c, 1, 0);
-  raw_vfs_pwrite(s->ptr_socket_fd, &c, 1, 0);
+  fifo_object_write((uint8_t *)&c, 1, 0, s->fifo_file);
+  s->ptr_socket_fd->inode->has_data = 1;
 
   s->incoming_fd = get_current_task()->file_descriptors[fd[1]];
   // vfs_close(fd[1]);
@@ -52,7 +65,7 @@ int accept(int socket, struct sockaddr *address, socklen_t *address_len) {
   if (NULL == s->incoming_fd) {
     // Wait until we have gotten a connection
     struct pollfd fds[1];
-    fds[0].fd = s->fifo_fd;
+    fds[0].fd = socket;
     fds[0].events = POLLIN;
     fds[0].revents = 0;
     poll(fds, 1, 0);
@@ -64,8 +77,8 @@ int accept(int socket, struct sockaddr *address, socklen_t *address_len) {
   get_current_task()->file_descriptors[n] = s->incoming_fd;
   get_current_task()->file_descriptors[n]->reference_count++;
   s->incoming_fd = NULL;
-  for (char c; 0 < vfs_pread(s->fifo_fd, &c, 1, 0);)
-    ;
+  //  for (char c; 0 < vfs_pread(s->fifo_fd, &c, 1, 0);)
+  //    ;
   inode->has_data = 0;
   //  s->ptr_fifo_fd->inode->has_data = 0;
 
@@ -74,8 +87,6 @@ int accept(int socket, struct sockaddr *address, socklen_t *address_len) {
 
 int bind(int sockfd, const struct sockaddr *addr, socklen_t addrlen) {
   (void)addrlen;
-  struct sockaddr_un *un = (struct sockaddr_un *)addr;
-
   vfs_fd_t *fd = get_vfs_fd(sockfd);
   if (!fd)
     return -EBADF;
@@ -83,44 +94,64 @@ int bind(int sockfd, const struct sockaddr *addr, socklen_t addrlen) {
   if (!inode)
     return -EBADF;
   SOCKET *s = (SOCKET *)inode->internal_object;
-
-  size_t path_len = strlen(un->sun_path);
-  s->path = kmalloc(path_len + 1);
-  memcpy(s->path, un->sun_path, path_len);
-  s->path[path_len] = '\0';
-
-  OPEN_UNIX_SOCKET *us;
-  int i = 0;
-  for (; i < 100; i++)
-    if (!un_sockets[i])
-      break;
-
-  us = un_sockets[i] = kmalloc(sizeof(OPEN_UNIX_SOCKET));
-
-  us->path = s->path;
-  us->s = s;
-  devfs_add_file(us->path, NULL, NULL, NULL, 1, 1, FS_TYPE_UNIX_SOCKET);
+  if (AF_UNIX == s->domain) {
+    struct sockaddr_un *un = (struct sockaddr_un *)addr;
+    size_t path_len = strlen(un->sun_path);
+    s->path = kmalloc(path_len + 1);
+    memcpy(s->path, un->sun_path, path_len);
+    s->path[path_len] = '\0';
+
+    OPEN_UNIX_SOCKET *us;
+    int i = 0;
+    for (; i < 100; i++)
+      if (!un_sockets[i])
+        break;
+
+    us = un_sockets[i] = kmalloc(sizeof(OPEN_UNIX_SOCKET));
+
+    us->path = s->path;
+    us->s = s;
+    devfs_add_file(us->path, NULL, NULL, NULL, 1, 1, FS_TYPE_UNIX_SOCKET);
+    return 0;
+  }
+  if (AF_INET == s->domain) {
+    struct sockaddr_in *in = (struct sockaddr_in *)addr;
+    assert(in->sin_family == AF_INET); // FIXME: Figure out error value
+    OPEN_INET_SOCKET *inet;
+    int i = 0;
+    for (; i < 100; i++)
+      if (!inet_sockets[i])
+        break;
+
+    inet = inet_sockets[i] = kmalloc(sizeof(OPEN_INET_SOCKET));
+    inet->address = in->sin_addr.s_addr;
+    inet->port = in->sin_port;
+    inet->s = s;
+    return 0;
+  }
   return 0;
 }
 
 int socket_write(uint8_t *buffer, uint64_t offset, uint64_t len, vfs_fd_t *fd) {
-  (void)buffer;
-  (void)offset;
-  fd->inode->has_data = 1;
-  return len;
+  SOCKET *s = (SOCKET *)fd->inode->internal_object;
+  FIFO_FILE *file = s->fifo_file;
+  int rc = fifo_object_write(buffer, 0, len, file);
+  fd->inode->has_data = file->has_data;
+  return rc;
 }
 
 int socket_read(uint8_t *buffer, uint64_t offset, uint64_t len, vfs_fd_t *fd) {
-  (void)buffer;
-  (void)offset;
-  fd->inode->has_data = 0;
-  return len;
+  SOCKET *s = (SOCKET *)fd->inode->internal_object;
+  FIFO_FILE *file = s->fifo_file;
+  int rc = fifo_object_read(buffer, 0, len, file);
+  fd->inode->has_data = file->has_data;
+  return rc;
 }
 
 void socket_close(vfs_fd_t *fd) { fd->inode->is_open = 0; }
 
 int socket(int domain, int type, int protocol) {
-  if (AF_UNIX != domain)
+  if (!(AF_UNIX == domain || AF_INET == domain))
     return -EINVAL;
 
   SOCKET *new_socket = kmalloc_eternal(sizeof(SOCKET));
@@ -128,7 +159,8 @@ int socket(int domain, int type, int protocol) {
       0 /*inode_num*/, FS_TYPE_UNIX_SOCKET, 0 /*has_data*/, 1 /*can_write*/,
       1 /*is_open*/, new_socket /*internal_object*/, 0 /*file_size*/,
       NULL /*open*/, NULL /*create_file*/, socket_read, socket_write,
-      socket_close, NULL/*create_directory*/, NULL /*get_vm_object*/, NULL/*truncate*/);
+      socket_close, NULL /*create_directory*/, NULL /*get_vm_object*/,
+      NULL /*truncate*/);
 
   vfs_fd_t *fd;
   int n = vfs_create_fd(O_RDWR | O_NONBLOCK, 0, inode, &fd);
@@ -138,11 +170,9 @@ int socket(int domain, int type, int protocol) {
   new_socket->protocol = protocol;
   new_socket->path = NULL;
   new_socket->incoming_fd = NULL;
-  new_socket->fifo_fd = create_fifo();
-  new_socket->ptr_fifo_fd =
-      get_current_task()->file_descriptors[new_socket->fifo_fd];
 
-  new_socket->ptr_socket_fd = fd;
+  new_socket->fifo_file = create_fifo_object();
 
+  new_socket->ptr_socket_fd = fd;
   return n;
 }