Removed packet_wait for SSH2

include/libssh/packet.h

@@ -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);
 
 

libssh/packet.c

@@ -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: */