diff options
| author | Aris Adamantiadis <aris@0xbadc0de.be> | 2010-01-03 23:36:06 +0100 |
|---|---|---|
| committer | Aris Adamantiadis <aris@0xbadc0de.be> | 2010-01-03 23:36:06 +0100 |
| commit | 335a0fe768fcf8840e596f026519161e3a54654d (patch) | |
| tree | bf5ef4e3a704ba248ef0dd0330db96bbcb6424a8 | |
| parent | b25ebf4bdb67fb744e923737e4fb542acbdbede3 (diff) | |
| download | libssh-335a0fe768fcf8840e596f026519161e3a54654d.tar.gz libssh-335a0fe768fcf8840e596f026519161e3a54654d.tar.xz libssh-335a0fe768fcf8840e596f026519161e3a54654d.zip | |
Remove some references to packet_wait()
| -rw-r--r-- | include/libssh/packet.h | 1 | ||||
| -rw-r--r-- | libssh/channels.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/libssh/packet.h b/include/libssh/packet.h index 84a09ea3..b725dc2e 100644 --- a/include/libssh/packet.h +++ b/include/libssh/packet.h @@ -33,6 +33,7 @@ int packet_send(ssh_session session); int packet_read(ssh_session session); int packet_translate(ssh_session session); +/* TODO: remove it when packet_wait is stripped out from libssh */ int packet_wait(ssh_session session,int type,int blocking); int packet_flush(ssh_session session, int enforce_blocking); diff --git a/libssh/channels.c b/libssh/channels.c index 36a38d7b..d7853984 100644 --- a/libssh/channels.c +++ b/libssh/channels.c @@ -936,7 +936,7 @@ int channel_write_common(ssh_channel channel, const void *data, /* What happens when the channel window is zero? */ while(channel->remote_window == 0) { /* parse every incoming packet */ - if (packet_wait(channel->session, 0, 0) == SSH_ERROR) { + if (ssh_handle_packets(session) == SSH_ERROR) { leave_function(); return SSH_ERROR; } @@ -2127,7 +2127,7 @@ int channel_get_exit_status(ssh_channel channel) { while (channel->remote_eof == 0 || channel->exit_status == -1) { /* Parse every incoming packet */ - if (packet_wait(channel->session, 0, 0) != SSH_OK) { + if (ssh_handle_packets(channel->session) != SSH_OK) { return -1; } if (channel->open == 0) { |