shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-04 20:30:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Removed packet_wait for SSH2

Browse Source
This commit is contained in:
Aris Adamantiadis
2010-01-06 22:53:10 +01:00
parent 84ec17964e
commit b6656a1525
2 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/libssh/packet.h
View File

@@ -34,7 +34,9 @@ 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 */
#ifdef WITH_SSH1
int packet_wait(ssh_session session,int type,int blocking);
#endif
int packet_flush(ssh_session session, int enforce_blocking);

22
libssh/packet.c
View File

@@ -954,7 +954,7 @@ void packet_parse(ssh_session session) {
#endif
#ifdef WITH_SSH1
static int packet_wait1(ssh_session session, int type, int blocking) {
int packet_wait(ssh_session session, int type, int blocking) {
enter_function();
@@ -1011,24 +1011,4 @@ static int packet_wait1(ssh_session session, int type, int blocking) {
}
#endif /* WITH_SSH1 */
static int packet_wait2(ssh_session session, int type, int blocking) {
int rc = SSH_ERROR;
(void) type;
(void) blocking;
enter_function();
ssh_log(session,SSH_LOG_RARE,"packet_wait called. BAD!");
rc=ssh_handle_packets(session);
leave_function();
return rc;
}
int packet_wait(ssh_session session, int type, int block) {
#ifdef WITH_SSH1
if (session->version == 1) {
return packet_wait1(session, type, block);
}
#endif
return packet_wait2(session, type, block);
}
/* vim: set ts=2 sw=2 et cindent: */