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

Add more error checks to ssh_socket_wait_for_data().

Browse Source 
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@467 7dcaeef0-15fb-0310-b436-a5af3365683c
This commit is contained in:
Andreas Schneider
2009-04-14 14:12:50 +00:00
parent fc1cba4407
commit d36a208849
1 changed files with 80 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
libssh/socket.c
View File

@@ -386,63 +386,88 @@ int ssh_socket_write(struct socket *s, const void *buffer, int len) {
* \returns SSH_AGAIN need to call later for data * \returns SSH_AGAIN need to call later for data
* \returns SSH_ERROR error happened * \returns SSH_ERROR error happened
*/ */
int ssh_socket_wait_for_data(struct socket *s, SSH_SESSION *session, u32 len){ int ssh_socket_wait_for_data(struct socket *s, SSH_SESSION *session, u32 len) {
int except, can_write; char buffer[4096] = {0};
char *buf = NULL;
int except;
int can_write;
int to_read; int to_read;
int r; int r;
char *buf;
char buffer[4096];
enter_function(); enter_function();
to_read=len - buffer_get_rest_len(s->in_buffer);
if(to_read <= 0){ to_read = len - buffer_get_rest_len(s->in_buffer);
if (to_read <= 0) {
leave_function(); leave_function();
return SSH_OK; return SSH_OK;
} }
if(session->blocking){
buf=malloc(to_read); if (session->blocking) {
buf = malloc(to_read);
if (buf == NULL) { if (buf == NULL) {
leave_function(); leave_function();
return SSH_ERROR; return SSH_ERROR;
} }
r=ssh_socket_completeread(session->socket,buf,to_read);
if(r==SSH_ERROR || r ==0){ r = ssh_socket_completeread(session->socket,buf,to_read);
ssh_set_error(session,SSH_FATAL, if (r == SSH_ERROR || r == 0) {
(r==0)?"Connection closed by remote host" : "Error reading socket"); ssh_set_error(session, SSH_FATAL,
(r == 0) ? "Connection closed by remote host" :
"Error reading socket");
ssh_socket_close(session->socket); ssh_socket_close(session->socket);
session->alive=0; session->alive = 0;
free(buf); SAFE_FREE(buf);
leave_function(); leave_function();
return SSH_ERROR; return SSH_ERROR;
} }
buffer_add_data(s->in_buffer,buf,to_read); if (buffer_add_data(s->in_buffer,buf,to_read) < 0) {
free(buf); SAFE_FREE(buf);
leave_function();
return SSH_ERROR;
}
SAFE_FREE(buf);
leave_function(); leave_function();
return SSH_OK; return SSH_OK;
} }
/* nonblocking read */ /* nonblocking read */
do { do {
ssh_socket_poll(s,&can_write,&except); /* internally sets data_to_read */ /* internally sets data_to_read */
if(!s->data_to_read){ r = ssh_socket_poll(s, &can_write, &except);
if (r < 0 || !s->data_to_read) {
leave_function(); leave_function();
return SSH_AGAIN; return SSH_AGAIN;
} }
/* read as much as we can */ /* read as much as we can */
if(ssh_socket_is_open(session->socket)) if (ssh_socket_is_open(session->socket)) {
r=ssh_socket_unbuffered_read(session->socket,buffer,sizeof(buffer)); r = ssh_socket_unbuffered_read(session->socket, buffer, sizeof(buffer));
else } else {
r=-1; r =- 1;
if(r<=0){ }
ssh_set_error(session,SSH_FATAL,
(r==0)?"Connection closed by remote host" : "Error reading socket"); if (r <= 0) {
ssh_set_error(session, SSH_FATAL,
(r == 0) ? "Connection closed by remote host" :
"Error reading socket");
ssh_socket_close(session->socket); ssh_socket_close(session->socket);
session->alive=0; session->alive = 0;
leave_function(); leave_function();
return SSH_ERROR; return SSH_ERROR;
} }
buffer_add_data(s->in_buffer,buffer, (u32) r);
} while(buffer_get_rest_len(s->in_buffer)<len); if (buffer_add_data(s->in_buffer,buffer, (u32) r) < 0) {
leave_function();
return SSH_ERROR;
}
} while(buffer_get_rest_len(s->in_buffer) < len);
leave_function(); leave_function();
return SSH_OK; return SSH_OK;
} }