aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/libssh/libssh.h6
-rw-r--r--src/socket.c6
2 files changed, 8 insertions, 4 deletions
diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h
index a451620e..84d05937 100644
--- a/include/libssh/libssh.h
+++ b/include/libssh/libssh.h
@@ -208,10 +208,14 @@ enum ssh_publickey_state_e {
SSH_PUBLICKEY_STATE_WRONG=2
};
-/* status flags */
+/* Status flags */
+/** Socket is closed */
#define SSH_CLOSED 0x01
+/** Reading to socket won't block */
#define SSH_READ_PENDING 0x02
+/** Session was closed due to an error */
#define SSH_CLOSED_ERROR 0x04
+/** Output buffer not empty */
#define SSH_WRITE_PENDING 0x08
enum ssh_server_known_e {
diff --git a/src/socket.c b/src/socket.c
index 0dbbe2bc..c76ef5ae 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -695,11 +695,11 @@ int ssh_socket_buffered_write_bytes(ssh_socket s){
int ssh_socket_get_status(ssh_socket s) {
int r = 0;
- if (s->read_wontblock) {
- r |= SSH_READ_PENDING;
+ if (buffer_get_len(s->in_buffer) > 0) {
+ r |= SSH_READ_PENDING;
}
- if (s->write_wontblock) {
+ if (buffer_get_len(s->out_buffer) > 0) {
r |= SSH_WRITE_PENDING;
}