rundir - Network dumps

Author: thepowersgang

NativeKernel/Cargo.toml

@@ -10,10 +10,10 @@ vfs = { path = "../Kernel/Modules/vfs", features = [] }
 gui = { path = "../Kernel/Modules/gui", features = [] }
 network = { path = "../Kernel/Modules/network", features = [] }
 
-lwip = { path = "../Kernel/tests/network/lwip", optional = true, features = [] }
+libslirp = { version = "4.3.2", optional = true }
 
 process-memory = "0.4"
 minifb = "0.28"
 
 [features]
-network = ["lwip"]
+network = ["libslirp"]

rundir/Makefile

@@ -74,8 +74,10 @@ ifeq ($(ARCH),amd64)
 CMDLINE += SYSDISK=ATA-0p0
 QEMU_ARGS += -smp 2
 QEMU_ARGS += -vga virtio
-QEMU_ARGS += -net nic,model=rtl8139
-# -net dump
+#QEMU_ARGS += -net nic,model=rtl8139
+#QEMU_ARGS += -netdev user,id=usrnet1
+QEMU_ARGS += -device rtl8139,netdev=usrnet1
+QEMU_ARGS += -object filter-dump,id=f1,netdev=usrnet1,file=usrnet1.pcap
 QEMU_ARGS += -drive if=ide,index=0,file=$(IMGDIR)hda.img,format=raw
 QEMU_ARGS += -cdrom $(IMGDIR)test.iso
 QEMU_ARGS += -device ahci,id=ahci

rundir/RunQemuPXE

@@ -5,7 +5,7 @@ IMAGE="$1"
 ARGS="$2"
 QEMU_OPTS="$3"
 
-QEMU_OPTS=$QEMU_OPTS" -net user,tftp=.pxe/,bootfile=pxelinux.0"
+QEMU_OPTS=$QEMU_OPTS" -netdev user,id=usrnet1,tftp=.pxe/,bootfile=pxelinux.0"
 QEMU_OPTS=$QEMU_OPTS" -boot n"
 
 PXELINUX_DIR=/usr/lib/syslinux/