Fix network, ping works again

2023-02-02 00:37:11 +00:00
parent be21f83af2
commit 987095fdef
7 changed files with 198 additions and 124 deletions
--- a/vnet/file.c
+++ b/vnet/file.c
@@ -7,9 +7,88 @@
    Copyright (C) 2023  Ivan Baravy <dunkaist@gmail.com>
 */

-#include <stddef.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "trace.h"
+#include "umka.h"
+#include "vnet.h"
+
+static STDCALL void
+vnet_unload_file() {
+    printf("vnet_unload_file\n");
+    COVERAGE_ON();
+    COVERAGE_OFF();
+}
+
+static STDCALL void
+vnet_reset_file() {
+    printf("vnet_reset_file\n");
+    COVERAGE_ON();
+    COVERAGE_OFF();
+}
+
+static void
+dump_net_buff(net_buff_t *buf) {
+    for (size_t i = 0; i < buf->length; i++) {
+        printf("%2.2x ", buf->data[i]);
+    }
+    putchar('\n');
+}
+
+static STDCALL int
+vnet_transmit_file(net_buff_t *buf) {
+    struct vnet *net;
+    __asm__ __inline__ __volatile__ (
+        ""
+        : "=b"(net)
+        :
+        : "memory");
+
+    printf("vnet_transmit: %d bytes\n", buf->length);
+    dump_net_buff(buf);
+    write(net->fdout, buf->data, buf->length);
+    buf->length = 0;
+    COVERAGE_OFF();
+    COVERAGE_ON();
+    printf("vnet_transmit: done\n");
+    return 0;
+}

 struct vnet *
 vnet_init_file() {
-    return NULL;
+    int fdin;
+    int fdout;
+
+    if( (fdin = open("/path/to/fdin", O_RDONLY | O_NONBLOCK)) < 0 ) {
+        perror("[vnet_file] can't open input file");
+        return NULL;
+    }
+
+    if( (fdout = open("/path/to/fdin", O_WRONLY | O_NONBLOCK)) < 0 ) {
+        perror("[vnet_file] can't open output file");
+        return NULL;
+    }
+
+    struct vnet *vnet = malloc(sizeof(struct vnet));
+    vnet->eth.net.device_type = NET_TYPE_ETH;
+    vnet->eth.net.mtu = 1514;
+    char *devname = malloc(8);
+    sprintf(devname, "UMKFIL%d", 0);   // FIXME: support more devices
+    vnet->eth.net.name = devname;
+
+    vnet->eth.net.unload = vnet_unload_file;
+    vnet->eth.net.reset = vnet_reset_file;
+    vnet->eth.net.transmit = vnet_transmit_file;
+
+    vnet->fdin = fdin;
+    vnet->fdout = fdout;
+    vnet->input_processed = 1;
+
+    memcpy(vnet->eth.mac, (uint8_t[]){0x80, 0x2b, 0xf9, 0x3b, 0x6c, 0xca},
+           sizeof(vnet->eth.mac));
+
+    return vnet;
 }