wolfSSHd Connection Closure #718
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ejohnstown
force-pushed
the
wolfsshd-closure
branch
from
6f2548a to
8f0b1ad
Compare
douzzer
requested changes
Jul 15, 2024
apps/wolfsshd/wolfsshd.c
Outdated
| WMEMSET(cmd, 0, sizeof(cmd)); | ||
| if (XSTRLEN(pPasswd->pw_shell) == 0) { | ||
| XSNPRINTF(cmd, sizeof(cmd), "%s", "/bin/sh"); | ||
| if (pPasswd->pw_shell && XSTRLEN(pPasswd->pw_shell)) { |
apps/wolfsshd/wolfsshd.c
Outdated
| if (XSTRLEN(pPasswd->pw_shell) == 0) { | ||
| XSNPRINTF(cmd, sizeof(cmd), "%s", "/bin/sh"); | ||
| if (pPasswd->pw_shell && XSTRLEN(pPasswd->pw_shell)) { | ||
| XSNPRINTF(cmd, sizeof(cmd), "%s", pPasswd->pw_shell); |
douzzer
approved these changes
Jul 16, 2024
douzzer
requested changes
Jul 16, 2024
1. Initialize all the fds to -1. 2. Add flags for peerConnected and stdoutEmpty. 3. Remove the idle counter. 4. When the socket would block on write, set a flag to check the socket for writing later to call the worker which will send pending data. 5. When reading the pipes, a 0 returns means the pipe is closed. Deal with that. 6. If the ssh write fails, interrupt the subordinate process. 7. When waiting for the peer to close its channel and shutdown, sleep for 100ms, rather than 1us. It takes a little while to tear down. 8. Shutdown the peer socket. Spin on receiving the peer socket until it closes or has an error. 9. Fixed a few function wrappers; was using Xname instead of Wname.
ejohnstown
force-pushed
the
wolfsshd-closure
branch
from
1b796d7 to
6c69c12
Compare
douzzer
approved these changes
Jul 16, 2024
douzzer
approved these changes
Jul 16, 2024
jefferyq2
pushed a commit
to jefferyq2/wolfssh
that referenced
this pull request
Sep 24, 2024
wolfSSHd Connection Closure
jefferyq2
pushed a commit
to jefferyq2/wolfssh
that referenced
this pull request
Oct 18, 2024
wolfSSHd Connection Closure
jefferyq2
pushed a commit
to jefferyq2/wolfssh
that referenced
this pull request
Oct 29, 2024
wolfSSHd Connection Closure
jefferyq2
pushed a commit
to jefferyq2/wolfssh
that referenced
this pull request
Oct 29, 2024
wolfSSHd Connection Closure
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
DESCRIPTION
Improvements to wolfSSHd to shutdown the connection cleaner, without disconnection errors. The server will keep processing the channel data and close its side of the connection. On socket shutdown, it will
shutdownits side of the socket and read data from the socket until 0 return, then it closes the socket. Will also interrupt the child process if there are any socket errors.(ZD 17722)