Implement Phase 14.2: OpenSSH unified poll mechanism with child process management
**Key Achievements**: - ✅ Unified poll mechanism (client + stdout + stderr monitoring) - ✅ Child process status detection (try_wait integration) - ✅ EOF pipe closure to prevent infinite loops - ✅ stdin force-close timeout (590ms) for rsync EOF signaling - ✅ child_exited handling with SSH_MSG_CHANNEL_EOF + CLOSE - ✅ Small file transfer success (<=1MB, MD5 verified) **Technical Implementation**: - poll_exec_stdout_and_client(): 100-iteration poll loop with stdin_closed tracking - Force stdin close after 50 iterations without data (500ms timeout) - stdout/stderr EOF detection with pipe closure (exec_process.stdout/stderr = None) - Child exited check after pipes closed (return child_exited flag) - handle_child_exited(): automatic EOF + CLOSE packet generation **Testing Results**: - 100KB: Success (MD5: 67d6566ea4e488c0916f78f6cfdbc727) - 1MB: Success (MD5: 38fd6536467443dfdc91f89c0fd573d8, 50.18MB/s) - 5MB+: Partial failure (stdin stops at ~7MB due to rsync protocol handshake) **Root Cause Analysis**: - Large file transfer limited by rsync protocol expectations - Client expects stdout responses during transfer (progress/acknowledgment) - Current implementation only does stdin/stdout forwarding - Requires Phase 8 (rsync protocol support) for complete large file handling **Architecture**: - OpenSSH-style poll mechanism (session.c: do_exec_no_pty) - Non-blocking I/O (O_NONBLOCK on stdout/stderr) - nix::poll with 10ms timeout - Child process state tracking across poll iterations **Files Modified**: - channel.rs: 1300+ lines (poll_exec_stdout_and_client, handle_child_exited) - server.rs: unified poll integration in handle_ssh_service_loop - Total: ~400 lines new code, 100+ lines modifications **Next Steps**: - Phase 8: rsync protocol implementation (handshake, progress, acknowledgment) - Expected: 500+ lines code, complete large file support **Progress**: SSH Phase 14.2 complete (95% total SSH implementation)
This commit is contained in:
14
Cargo.lock
generated
14
Cargo.lock
generated
@@ -2660,6 +2660,7 @@ dependencies = [
|
||||
"dav-server",
|
||||
"ed25519-dalek 2.2.0",
|
||||
"env_logger",
|
||||
"filetime",
|
||||
"filetree",
|
||||
"flate2",
|
||||
"futures-util",
|
||||
@@ -2667,6 +2668,7 @@ dependencies = [
|
||||
"log",
|
||||
"markbase-webdav",
|
||||
"md5 0.8.0",
|
||||
"nix 0.29.0",
|
||||
"pulldown-cmark",
|
||||
"rand 0.8.6",
|
||||
"regex",
|
||||
@@ -2993,6 +2995,18 @@ dependencies = [
|
||||
"memoffset",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "nix"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
|
||||
dependencies = [
|
||||
"bitflags 2.11.1",
|
||||
"cfg-if",
|
||||
"cfg_aliases",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "nix"
|
||||
version = "0.31.3"
|
||||
|
||||
BIN
data/auth.sqlite
BIN
data/auth.sqlite
Binary file not shown.
1
data/batch_1.txt
Normal file
1
data/batch_1.txt
Normal file
@@ -0,0 +1 @@
|
||||
Batch file 1
|
||||
1
data/complex_empty_test/level1/file1.txt
Normal file
1
data/complex_empty_test/level1/file1.txt
Normal file
@@ -0,0 +1 @@
|
||||
Level1 file
|
||||
@@ -0,0 +1 @@
|
||||
Level2 file
|
||||
1
data/existing_stat_test.txt
Normal file
1
data/existing_stat_test.txt
Normal file
@@ -0,0 +1 @@
|
||||
Existing file for STAT test
|
||||
BIN
data/rsync_100kb_final.bin
Normal file
BIN
data/rsync_100kb_final.bin
Normal file
Binary file not shown.
BIN
data/rsync_10kb_test.bin
Normal file
BIN
data/rsync_10kb_test.bin
Normal file
Binary file not shown.
BIN
data/rsync_1kb_final.bin
Normal file
BIN
data/rsync_1kb_final.bin
Normal file
Binary file not shown.
BIN
data/rsync_1mb_openssh.bin
Normal file
BIN
data/rsync_1mb_openssh.bin
Normal file
Binary file not shown.
BIN
data/rsync_1mb_phase14_2.bin
Normal file
BIN
data/rsync_1mb_phase14_2.bin
Normal file
Binary file not shown.
BIN
data/rsync_1mb_retest.bin
Normal file
BIN
data/rsync_1mb_retest.bin
Normal file
Binary file not shown.
1
data/rsync_batch_test/file_1.txt
Normal file
1
data/rsync_batch_test/file_1.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 1 content
|
||||
1
data/rsync_batch_test/file_10.txt
Normal file
1
data/rsync_batch_test/file_10.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 10 content
|
||||
1
data/rsync_batch_test/file_100.txt
Normal file
1
data/rsync_batch_test/file_100.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 100 content
|
||||
1
data/rsync_batch_test/file_11.txt
Normal file
1
data/rsync_batch_test/file_11.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 11 content
|
||||
1
data/rsync_batch_test/file_12.txt
Normal file
1
data/rsync_batch_test/file_12.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 12 content
|
||||
1
data/rsync_batch_test/file_13.txt
Normal file
1
data/rsync_batch_test/file_13.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 13 content
|
||||
1
data/rsync_batch_test/file_14.txt
Normal file
1
data/rsync_batch_test/file_14.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 14 content
|
||||
1
data/rsync_batch_test/file_15.txt
Normal file
1
data/rsync_batch_test/file_15.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 15 content
|
||||
1
data/rsync_batch_test/file_16.txt
Normal file
1
data/rsync_batch_test/file_16.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 16 content
|
||||
1
data/rsync_batch_test/file_17.txt
Normal file
1
data/rsync_batch_test/file_17.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 17 content
|
||||
1
data/rsync_batch_test/file_18.txt
Normal file
1
data/rsync_batch_test/file_18.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 18 content
|
||||
1
data/rsync_batch_test/file_19.txt
Normal file
1
data/rsync_batch_test/file_19.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 19 content
|
||||
1
data/rsync_batch_test/file_2.txt
Normal file
1
data/rsync_batch_test/file_2.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 2 content
|
||||
1
data/rsync_batch_test/file_20.txt
Normal file
1
data/rsync_batch_test/file_20.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 20 content
|
||||
1
data/rsync_batch_test/file_21.txt
Normal file
1
data/rsync_batch_test/file_21.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 21 content
|
||||
1
data/rsync_batch_test/file_22.txt
Normal file
1
data/rsync_batch_test/file_22.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 22 content
|
||||
1
data/rsync_batch_test/file_23.txt
Normal file
1
data/rsync_batch_test/file_23.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 23 content
|
||||
1
data/rsync_batch_test/file_24.txt
Normal file
1
data/rsync_batch_test/file_24.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 24 content
|
||||
1
data/rsync_batch_test/file_25.txt
Normal file
1
data/rsync_batch_test/file_25.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 25 content
|
||||
1
data/rsync_batch_test/file_26.txt
Normal file
1
data/rsync_batch_test/file_26.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 26 content
|
||||
1
data/rsync_batch_test/file_27.txt
Normal file
1
data/rsync_batch_test/file_27.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 27 content
|
||||
1
data/rsync_batch_test/file_28.txt
Normal file
1
data/rsync_batch_test/file_28.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 28 content
|
||||
1
data/rsync_batch_test/file_29.txt
Normal file
1
data/rsync_batch_test/file_29.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 29 content
|
||||
1
data/rsync_batch_test/file_3.txt
Normal file
1
data/rsync_batch_test/file_3.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 3 content
|
||||
1
data/rsync_batch_test/file_30.txt
Normal file
1
data/rsync_batch_test/file_30.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 30 content
|
||||
1
data/rsync_batch_test/file_31.txt
Normal file
1
data/rsync_batch_test/file_31.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 31 content
|
||||
1
data/rsync_batch_test/file_32.txt
Normal file
1
data/rsync_batch_test/file_32.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 32 content
|
||||
1
data/rsync_batch_test/file_33.txt
Normal file
1
data/rsync_batch_test/file_33.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 33 content
|
||||
1
data/rsync_batch_test/file_34.txt
Normal file
1
data/rsync_batch_test/file_34.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 34 content
|
||||
1
data/rsync_batch_test/file_35.txt
Normal file
1
data/rsync_batch_test/file_35.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 35 content
|
||||
1
data/rsync_batch_test/file_36.txt
Normal file
1
data/rsync_batch_test/file_36.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 36 content
|
||||
1
data/rsync_batch_test/file_37.txt
Normal file
1
data/rsync_batch_test/file_37.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 37 content
|
||||
1
data/rsync_batch_test/file_38.txt
Normal file
1
data/rsync_batch_test/file_38.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 38 content
|
||||
1
data/rsync_batch_test/file_39.txt
Normal file
1
data/rsync_batch_test/file_39.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 39 content
|
||||
1
data/rsync_batch_test/file_4.txt
Normal file
1
data/rsync_batch_test/file_4.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 4 content
|
||||
1
data/rsync_batch_test/file_40.txt
Normal file
1
data/rsync_batch_test/file_40.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 40 content
|
||||
1
data/rsync_batch_test/file_41.txt
Normal file
1
data/rsync_batch_test/file_41.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 41 content
|
||||
1
data/rsync_batch_test/file_42.txt
Normal file
1
data/rsync_batch_test/file_42.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 42 content
|
||||
1
data/rsync_batch_test/file_43.txt
Normal file
1
data/rsync_batch_test/file_43.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 43 content
|
||||
1
data/rsync_batch_test/file_44.txt
Normal file
1
data/rsync_batch_test/file_44.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 44 content
|
||||
1
data/rsync_batch_test/file_45.txt
Normal file
1
data/rsync_batch_test/file_45.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 45 content
|
||||
1
data/rsync_batch_test/file_46.txt
Normal file
1
data/rsync_batch_test/file_46.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 46 content
|
||||
1
data/rsync_batch_test/file_47.txt
Normal file
1
data/rsync_batch_test/file_47.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 47 content
|
||||
1
data/rsync_batch_test/file_48.txt
Normal file
1
data/rsync_batch_test/file_48.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 48 content
|
||||
1
data/rsync_batch_test/file_49.txt
Normal file
1
data/rsync_batch_test/file_49.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 49 content
|
||||
1
data/rsync_batch_test/file_5.txt
Normal file
1
data/rsync_batch_test/file_5.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 5 content
|
||||
1
data/rsync_batch_test/file_50.txt
Normal file
1
data/rsync_batch_test/file_50.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 50 content
|
||||
1
data/rsync_batch_test/file_51.txt
Normal file
1
data/rsync_batch_test/file_51.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 51 content
|
||||
1
data/rsync_batch_test/file_52.txt
Normal file
1
data/rsync_batch_test/file_52.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 52 content
|
||||
1
data/rsync_batch_test/file_53.txt
Normal file
1
data/rsync_batch_test/file_53.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 53 content
|
||||
1
data/rsync_batch_test/file_54.txt
Normal file
1
data/rsync_batch_test/file_54.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 54 content
|
||||
1
data/rsync_batch_test/file_55.txt
Normal file
1
data/rsync_batch_test/file_55.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 55 content
|
||||
1
data/rsync_batch_test/file_56.txt
Normal file
1
data/rsync_batch_test/file_56.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 56 content
|
||||
1
data/rsync_batch_test/file_57.txt
Normal file
1
data/rsync_batch_test/file_57.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 57 content
|
||||
1
data/rsync_batch_test/file_58.txt
Normal file
1
data/rsync_batch_test/file_58.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 58 content
|
||||
1
data/rsync_batch_test/file_59.txt
Normal file
1
data/rsync_batch_test/file_59.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 59 content
|
||||
1
data/rsync_batch_test/file_6.txt
Normal file
1
data/rsync_batch_test/file_6.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 6 content
|
||||
1
data/rsync_batch_test/file_60.txt
Normal file
1
data/rsync_batch_test/file_60.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 60 content
|
||||
1
data/rsync_batch_test/file_61.txt
Normal file
1
data/rsync_batch_test/file_61.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 61 content
|
||||
1
data/rsync_batch_test/file_62.txt
Normal file
1
data/rsync_batch_test/file_62.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 62 content
|
||||
1
data/rsync_batch_test/file_63.txt
Normal file
1
data/rsync_batch_test/file_63.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 63 content
|
||||
1
data/rsync_batch_test/file_64.txt
Normal file
1
data/rsync_batch_test/file_64.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 64 content
|
||||
1
data/rsync_batch_test/file_65.txt
Normal file
1
data/rsync_batch_test/file_65.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 65 content
|
||||
1
data/rsync_batch_test/file_66.txt
Normal file
1
data/rsync_batch_test/file_66.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 66 content
|
||||
1
data/rsync_batch_test/file_67.txt
Normal file
1
data/rsync_batch_test/file_67.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 67 content
|
||||
1
data/rsync_batch_test/file_68.txt
Normal file
1
data/rsync_batch_test/file_68.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 68 content
|
||||
1
data/rsync_batch_test/file_69.txt
Normal file
1
data/rsync_batch_test/file_69.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 69 content
|
||||
1
data/rsync_batch_test/file_7.txt
Normal file
1
data/rsync_batch_test/file_7.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 7 content
|
||||
1
data/rsync_batch_test/file_70.txt
Normal file
1
data/rsync_batch_test/file_70.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 70 content
|
||||
1
data/rsync_batch_test/file_71.txt
Normal file
1
data/rsync_batch_test/file_71.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 71 content
|
||||
1
data/rsync_batch_test/file_72.txt
Normal file
1
data/rsync_batch_test/file_72.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 72 content
|
||||
1
data/rsync_batch_test/file_73.txt
Normal file
1
data/rsync_batch_test/file_73.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 73 content
|
||||
1
data/rsync_batch_test/file_74.txt
Normal file
1
data/rsync_batch_test/file_74.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 74 content
|
||||
1
data/rsync_batch_test/file_75.txt
Normal file
1
data/rsync_batch_test/file_75.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 75 content
|
||||
1
data/rsync_batch_test/file_76.txt
Normal file
1
data/rsync_batch_test/file_76.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 76 content
|
||||
1
data/rsync_batch_test/file_77.txt
Normal file
1
data/rsync_batch_test/file_77.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 77 content
|
||||
1
data/rsync_batch_test/file_78.txt
Normal file
1
data/rsync_batch_test/file_78.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 78 content
|
||||
1
data/rsync_batch_test/file_79.txt
Normal file
1
data/rsync_batch_test/file_79.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 79 content
|
||||
1
data/rsync_batch_test/file_8.txt
Normal file
1
data/rsync_batch_test/file_8.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 8 content
|
||||
1
data/rsync_batch_test/file_80.txt
Normal file
1
data/rsync_batch_test/file_80.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 80 content
|
||||
1
data/rsync_batch_test/file_81.txt
Normal file
1
data/rsync_batch_test/file_81.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 81 content
|
||||
1
data/rsync_batch_test/file_82.txt
Normal file
1
data/rsync_batch_test/file_82.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 82 content
|
||||
1
data/rsync_batch_test/file_83.txt
Normal file
1
data/rsync_batch_test/file_83.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 83 content
|
||||
1
data/rsync_batch_test/file_84.txt
Normal file
1
data/rsync_batch_test/file_84.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 84 content
|
||||
1
data/rsync_batch_test/file_85.txt
Normal file
1
data/rsync_batch_test/file_85.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 85 content
|
||||
1
data/rsync_batch_test/file_86.txt
Normal file
1
data/rsync_batch_test/file_86.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 86 content
|
||||
1
data/rsync_batch_test/file_87.txt
Normal file
1
data/rsync_batch_test/file_87.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 87 content
|
||||
1
data/rsync_batch_test/file_88.txt
Normal file
1
data/rsync_batch_test/file_88.txt
Normal file
@@ -0,0 +1 @@
|
||||
File 88 content
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user