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

Add more error checks to ssh_socket_nonblocking_flush().

Browse Source 
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@469 7dcaeef0-15fb-0310-b436-a5af3365683c
This commit is contained in:
Andreas Schneider
2009-04-14 14:24:41 +00:00
parent 7eeb47ffad
commit f6e3f1d985
1 changed files with 62 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
libssh/socket.c
View File

@@ -601,44 +601,69 @@ int ssh_socket_poll(struct socket *s, int *writeable, int *except) {
/** \internal /** \internal
* \brief nonblocking flush of the output buffer * \brief nonblocking flush of the output buffer
*/ */
int ssh_socket_nonblocking_flush(struct socket *s){ int ssh_socket_nonblocking_flush(struct socket *s) {
int except, can_write; SSH_SESSION *session = s->session;
int except;
int can_write;
int w; int w;
SSH_SESSION *session=s->session;
enter_function(); enter_function();
ssh_socket_poll(s,&can_write,&except); /* internally sets data_to_write */
if(!ssh_socket_is_open(s)){ /* internally sets data_to_write */
session->alive=0; if (ssh_socket_poll(s, &can_write, &except) < 0) {
// FIXME use ssh_socket_get_errno
ssh_set_error(session,SSH_FATAL,"Writing packet : error on socket (or connection closed): %s",strerror(errno));
leave_function(); leave_function();
return SSH_ERROR; return SSH_ERROR;
} }
while(s->data_to_write && buffer_get_rest_len(s->out_buffer)>0){
if(ssh_socket_is_open(s)){ if (!ssh_socket_is_open(s)) {
w=ssh_socket_unbuffered_write(s,buffer_get_rest(s->out_buffer), session->alive = 0;
buffer_get_rest_len(s->out_buffer)); /* FIXME use ssh_socket_get_errno */
} else ssh_set_error(session, SSH_FATAL,
w=-1; /* write failed */ "Writing packet: error on socket (or connection closed): %s",
if(w<0){
session->alive=0;
ssh_socket_close(s);
// FIXME use ssh_socket_get_errno()
ssh_set_error(session,SSH_FATAL,"Writing packet : error on socket (or connection closed): %s",
strerror(errno)); strerror(errno));
leave_function(); leave_function();
return SSH_ERROR; return SSH_ERROR;
} }
buffer_pass_bytes(s->out_buffer,w);
while(s->data_to_write && buffer_get_rest_len(s->out_buffer) > 0) {
if (ssh_socket_is_open(s)) {
w = ssh_socket_unbuffered_write(s, buffer_get_rest(s->out_buffer),
buffer_get_rest_len(s->out_buffer));
} else {
/* write failed */
w =- 1;
}
if (w < 0) {
session->alive = 0;
ssh_socket_close(s);
/* FIXME use ssh_socket_get_errno() */
ssh_set_error(session, SSH_FATAL,
"Writing packet: error on socket (or connection closed): %s",
strerror(errno));
leave_function();
return SSH_ERROR;
}
buffer_pass_bytes(s->out_buffer, w);
/* refresh the socket status */ /* refresh the socket status */
ssh_socket_poll(session->socket,&can_write,&except); if (ssh_socket_poll(session->socket, &can_write, &except) < 0) {
}
if(buffer_get_rest_len(s->out_buffer)>0){
leave_function(); leave_function();
return SSH_AGAIN; /* there is data pending */ return SSH_ERROR;
} }
}
/* Is there some data pending? */
if (buffer_get_rest_len(s->out_buffer) > 0) {
leave_function(); leave_function();
return SSH_OK; // all data written return SSH_AGAIN;
}
/* all data written */
leave_function();
return SSH_OK;
} }