diff --git a/kernel/src/net/socket.rs b/kernel/src/net/socket.rs index 913dd09da..051d1abe9 100644 --- a/kernel/src/net/socket.rs +++ b/kernel/src/net/socket.rs @@ -511,9 +511,9 @@ pub struct UdpSocket { impl UdpSocket { /// 元数据的缓冲区的大小 pub const DEFAULT_METADATA_BUF_SIZE: usize = 1024; - /// 默认的发送缓冲区的大小 transmiss - pub const DEFAULT_RX_BUF_SIZE: usize = 64 * 1024; /// 默认的接收缓冲区的大小 receive + pub const DEFAULT_RX_BUF_SIZE: usize = 64 * 1024; + /// 默认的发送缓冲区的大小 transmiss pub const DEFAULT_TX_BUF_SIZE: usize = 64 * 1024; /// @brief 创建一个原始的socket diff --git a/tools/run-qemu.sh b/tools/run-qemu.sh index f1e211546..e8d38bd26 100644 --- a/tools/run-qemu.sh +++ b/tools/run-qemu.sh @@ -101,7 +101,7 @@ fi # ps: 下面这条使用tap的方式,无法dhcp获取到ip,暂时不知道为什么 # QEMU_DEVICES="-device ahci,id=ahci -device ide-hd,drive=disk,bus=ahci.0 -net nic,netdev=nic0 -netdev tap,id=nic0,model=virtio-net-pci,script=qemu/ifup-nat,downscript=qemu/ifdown-nat -usb -device qemu-xhci,id=xhci,p2=8,p3=4 " -QEMU_DEVICES="-device ahci,id=ahci -device ide-hd,drive=disk,bus=ahci.0 -netdev user,id=hostnet0,hostfwd=tcp::12580-:12580 -device virtio-net-pci,vectors=5,netdev=hostnet0,id=net0 -usb -device qemu-xhci,id=xhci,p2=8,p3=4 " +QEMU_DEVICES="-device ahci,id=ahci -device ide-hd,drive=disk,bus=ahci.0 -netdev user,id=hostnet0,hostfwd=tcp::12580-:12580,hostfwd=udp::12569-:69 -device virtio-net-pci,vectors=5,netdev=hostnet0,id=net0 -usb -device qemu-xhci,id=xhci,p2=8,p3=4 " # E1000E # QEMU_DEVICES="-device ahci,id=ahci -device ide-hd,drive=disk,bus=ahci.0 -netdev user,id=hostnet0,hostfwd=tcp::12580-:12580 -net nic,model=e1000e,netdev=hostnet0,id=net0 -netdev user,id=hostnet1,hostfwd=tcp::12581-:12581 -device virtio-net-pci,vectors=5,netdev=hostnet1,id=net1 -usb -device qemu-xhci,id=xhci,p2=8,p3=4 " QEMU_ARGUMENT+="-d ${QEMU_DISK_IMAGE} -m ${QEMU_MEMORY} -smp ${QEMU_SMP} -boot order=d ${QEMU_MONITOR} -d ${qemu_trace_std} " diff --git a/user/dadk/config/tftpd_0_2_10.dadk b/user/dadk/config/tftpd_0_2_10.dadk new file mode 100644 index 000000000..5118da397 --- /dev/null +++ b/user/dadk/config/tftpd_0_2_10.dadk @@ -0,0 +1,23 @@ +{ + "name": "tftpd", + "version": "0.2.10", + "description": "Multithreaded TFTP server daemon for DragonOS", + "task_type": { + "BuildFromSource": { + "Git": { + "url": "https://github.com/yuyi2439/rs-tftpd/", + "branch": "dragon-tftpd" + } + } + }, + "depends": [], + "build": { + "build_command": "make install" + }, + "install": { + "in_dragonos_path": "/" + }, + "clean": { + "clean_command": "make clean" + } +} \ No newline at end of file