Removed obsolete socket functions

include/libssh/socket.h

@@ -47,8 +47,8 @@ int ssh_socket_fd_isset(ssh_socket s, fd_set *set);
 void ssh_socket_fd_set(ssh_socket s, fd_set *set, int *fd_max);
 void ssh_socket_set_fd_in(ssh_socket s, socket_t fd);
 void ssh_socket_set_fd_out(ssh_socket s, socket_t fd);
-int ssh_socket_completeread(ssh_socket s, void *buffer, uint32_t len);
+//int ssh_socket_completeread(ssh_socket s, void *buffer, uint32_t len);
-int ssh_socket_completewrite(ssh_socket s, const void *buffer, uint32_t len);
+//int ssh_socket_completewrite(ssh_socket s, const void *buffer, uint32_t len);
 //int ssh_socket_wait_for_data(ssh_socket s, ssh_session session, uint32_t len);
 int ssh_socket_nonblocking_flush(ssh_socket s);
 int ssh_socket_blocking_flush(ssh_socket s);

libssh/client.c

@@ -234,10 +234,6 @@ int ssh_send_banner(ssh_session session, int server) {
     return -1;
   }
 
-  if (ssh_socket_blocking_flush(session->socket) != SSH_OK) {
-    leave_function();
-    return -1;
-  }
 #ifdef WITH_PCAP
   if(session->pcap_ctx)
   	ssh_pcap_context_write(session->pcap_ctx,SSH_PCAP_DIR_OUT,buffer,strlen(buffer),strlen(buffer));

libssh/packet.c

@@ -444,12 +444,10 @@ static int ssh_packet_write(ssh_session session) {
 
   enter_function();
 
-  ssh_socket_write(session->socket,
+  rc=ssh_socket_write(session->socket,
       ssh_buffer_get_begin(session->out_buffer),
       ssh_buffer_get_len(session->out_buffer));
 
-  rc = packet_flush(session, 0);
-
   leave_function();
   return rc;
 }

libssh/packet1.c

@@ -303,12 +303,12 @@ int packet_send1(ssh_session session) {
   ssh_print_hexa("encrypted packet",ssh_buffer_get_begin(session->out_buffer),
       ssh_buffer_get_len(session->out_buffer));
 #endif
-  if (ssh_socket_write(session->socket, ssh_buffer_get_begin(session->out_buffer),
+  rc=ssh_socket_write(session->socket, ssh_buffer_get_begin(session->out_buffer),
-      ssh_buffer_get_len(session->out_buffer)) == SSH_ERROR) {
+      ssh_buffer_get_len(session->out_buffer));
+  if(rc== SSH_ERROR) {
     goto error;
   }
 
-  rc = packet_flush(session, 0);
   session->send_seq++;
 
   if (buffer_reinit(session->out_buffer) < 0) {

libssh/socket.c

@@ -3,7 +3,7 @@
  *
  * This file is part of the SSH Library
  *
- * Copyright (c) 2008,2009      by Aris Adamantiadis
+ * Copyright (c) 2008-2010      by Aris Adamantiadis
  *
  * The SSH Library is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -505,59 +505,59 @@ void ssh_socket_fd_set(ssh_socket s, fd_set *set, socket_t *max_fd) {
 /** \internal
  * \brief reads blocking until len bytes have been read
  */
-int ssh_socket_completeread(ssh_socket s, void *buffer, uint32_t len) {
+//int ssh_socket_completeread(ssh_socket s, void *buffer, uint32_t len) {
-  int r = -1;
+//  int r = -1;
-  uint32_t total = 0;
+//  uint32_t total = 0;
-  uint32_t toread = len;
+//  uint32_t toread = len;
-  if(! ssh_socket_is_open(s)) {
+//  if(! ssh_socket_is_open(s)) {
-    return SSH_ERROR;
+//    return SSH_ERROR;
-  }
+//  }
-
+//
-  while((r = ssh_socket_unbuffered_read(s, ((uint8_t*)buffer + total), toread))) {
+//  while((r = ssh_socket_unbuffered_read(s, ((uint8_t*)buffer + total), toread))) {
-    if (r < 0) {
+//    if (r < 0) {
-      return SSH_ERROR;
+//      return SSH_ERROR;
-    }
+//    }
-    total += r;
+//    total += r;
-    toread -= r;
+//    toread -= r;
-    if (total == len) {
+//    if (total == len) {
-      return len;
+//      return len;
-    }
+//    }
-    if (r == 0) {
+//    if (r == 0) {
-      return 0;
+//      return 0;
-    }
+//    }
-  }
+//  }
-
+//
-  /* connection closed */
+//  /* connection closed */
-  return total;
+//  return total;
-}
+//}
-
+//
-/** \internal
+///** \internal
- * \brief Blocking write of len bytes
+// * \brief Blocking write of len bytes
- */
+// */
-int ssh_socket_completewrite(ssh_socket s, const void *buffer, uint32_t len) {
+//int ssh_socket_completewrite(ssh_socket s, const void *buffer, uint32_t len) {
-  ssh_session session = s->session;
+//  ssh_session session = s->session;
-  int written = -1;
+//  int written = -1;
-
+//
-  enter_function();
+//  enter_function();
-
+//
-  if(! ssh_socket_is_open(s)) {
+//  if(! ssh_socket_is_open(s)) {
-    leave_function();
+//    leave_function();
-    return SSH_ERROR;
+//    return SSH_ERROR;
-  }
+//  }
-
+//
-  while (len >0) {
+//  while (len >0) {
-    written = ssh_socket_unbuffered_write(s, buffer, len);
+//    written = ssh_socket_unbuffered_write(s, buffer, len);
-    if (written == 0 || written == -1) {
+//    if (written == 0 || written == -1) {
-      leave_function();
+//      leave_function();
-      return SSH_ERROR;
+//      return SSH_ERROR;
-    }
+//    }
-    len -= written;
+//    len -= written;
-    buffer = ((uint8_t*)buffer +  written);
+//    buffer = ((uint8_t*)buffer +  written);
-  }
+//  }
-
+//
-  leave_function();
+//  leave_function();
-  return SSH_OK;
+//  return SSH_OK;
-}
+//}
 
 /** \internal
  * \brief buffered write of data