diff options
| author | Sanne Raymaekers <sraymaek@redhat.com> | 2018-10-25 18:38:32 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2018-10-25 18:49:29 +0200 |
| commit | ced05eb6dbbd9a20f0b96a454203a8d158157123 (patch) | |
| tree | 684ea99d98350a51ea1fae679b234802fc70c213 /src/session.c | |
| parent | b796924fea7e61a4a8813acce9e510f2359aee34 (diff) | |
| download | libssh-ced05eb6dbbd9a20f0b96a454203a8d158157123.tar.gz libssh-ced05eb6dbbd9a20f0b96a454203a8d158157123.tar.xz libssh-ced05eb6dbbd9a20f0b96a454203a8d158157123.zip | |
socket: Undouble socket fds
Signed-off-by: Sanne Raymaekers <sraymaek@redhat.com>
Diffstat (limited to 'src/session.c')
| -rw-r--r-- | src/session.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/session.c b/src/session.c index f9c45a06..3953fe76 100644 --- a/src/session.c +++ b/src/session.c @@ -536,7 +536,7 @@ socket_t ssh_get_fd(ssh_session session) { return -1; } - return ssh_socket_get_fd_in(session->socket); + return ssh_socket_get_fd(session->socket); } /** @@ -599,7 +599,7 @@ void ssh_set_fd_except(ssh_session session) { * @return SSH_OK on success, SSH_ERROR otherwise. */ int ssh_handle_packets(ssh_session session, int timeout) { - ssh_poll_handle spoll_in,spoll_out; + ssh_poll_handle spoll; ssh_poll_ctx ctx; int tm = timeout; int rc; @@ -608,17 +608,13 @@ int ssh_handle_packets(ssh_session session, int timeout) { return SSH_ERROR; } - spoll_in = ssh_socket_get_poll_handle_in(session->socket); - spoll_out = ssh_socket_get_poll_handle_out(session->socket); - ssh_poll_add_events(spoll_in, POLLIN); - ctx = ssh_poll_get_ctx(spoll_in); + spoll = ssh_socket_get_poll_handle(session->socket); + ssh_poll_add_events(spoll, POLLIN); + ctx = ssh_poll_get_ctx(spoll); if (!ctx) { ctx = ssh_poll_get_default_ctx(session); - ssh_poll_ctx_add(ctx, spoll_in); - if (spoll_in != spoll_out) { - ssh_poll_ctx_add(ctx, spoll_out); - } + ssh_poll_ctx_add(ctx, spoll); } if (timeout == SSH_TIMEOUT_USER) { |