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

Reformat ssh_socket_poll().

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

177
libssh/socket.c
View File

@@ -482,98 +482,119 @@ int ssh_socket_wait_for_data(struct socket *s, SSH_SESSION *session, u32 len) {
* \param except value pointed to set to 1 if there is an exception * \param except value pointed to set to 1 if there is an exception
* \return 1 if it is possible to read, 0 otherwise, -1 on error * \return 1 if it is possible to read, 0 otherwise, -1 on error
*/ */
int ssh_socket_poll(struct socket *s, int *writeable, int *except){ int ssh_socket_poll(struct socket *s, int *writeable, int *except) {
SSH_SESSION *session=s->session; SSH_SESSION *session = s->session;
struct timeval sometime; struct timeval sometime;
fd_set rdes; // read set fd_set rdes; // read set
fd_set wdes; // writing set fd_set wdes; // writing set
fd_set edes; // exception set fd_set edes; // exception set
int fdmax=-1; int fdmax =- 1;
enter_function(); enter_function();
FD_ZERO(&rdes);
FD_ZERO(&wdes);
FD_ZERO(&edes);
if(!ssh_socket_is_open(s)){ FD_ZERO(&rdes);
*except=1; FD_ZERO(&wdes);
*writeable=0; FD_ZERO(&edes);
return 0;
} if (!ssh_socket_is_open(s)) {
*except = 1;
*writeable = 0;
return 0;
}
#ifdef SELECT_LIMIT_CHECK #ifdef SELECT_LIMIT_CHECK
// some systems don't handle the fds > FD_SETSIZE // some systems don't handle the fds > FD_SETSIZE
if(s->fd > FD_SETSIZE){ if(s->fd > FD_SETSIZE){
ssh_set_error(session, SSH_REQUEST_DENIED, "File descriptor out of range for select : %d",s->fd); ssh_set_error(session, SSH_REQUEST_DENIED,
leave_function(); "File descriptor out of range for select: %d", s->fd);
return -1;
}
#endif
if(!s->data_to_read)
ssh_socket_fd_set(s,&rdes,&fdmax);
if(!s->data_to_write)
ssh_socket_fd_set(s,&wdes,&fdmax);
ssh_socket_fd_set(s,&edes,&fdmax);
/* Set to return immediately (no blocking) */
sometime.tv_sec = 0;
sometime.tv_usec = 0;
/* Make the call, and listen for errors */
if (select(fdmax, &rdes,&wdes,&edes, &sometime) < 0) {
ssh_set_error(session,SSH_FATAL, "select: %s", strerror(errno));
leave_function();
return -1;
}
if(!s->data_to_read)
s->data_to_read=ssh_socket_fd_isset(s,&rdes);
if(!s->data_to_write)
s->data_to_write=ssh_socket_fd_isset(s,&wdes);
if(!s->data_except)
s->data_except=ssh_socket_fd_isset(s,&edes);
*except=s->data_except;
*writeable=s->data_to_write;
leave_function(); leave_function();
return s->data_to_read || (buffer_get_rest_len(s->in_buffer)>0); return -1;
}
#endif
if (!s->data_to_read) {
ssh_socket_fd_set(s, &rdes, &fdmax);
}
if (!s->data_to_write) {
ssh_socket_fd_set(s, &wdes, &fdmax);
}
ssh_socket_fd_set(s, &edes, &fdmax);
/* Set to return immediately (no blocking) */
sometime.tv_sec = 0;
sometime.tv_usec = 0;
/* Make the call, and listen for errors */
if (select(fdmax, &rdes, &wdes, &edes, &sometime) < 0) {
ssh_set_error(session, SSH_FATAL, "select(): %s", strerror(errno));
leave_function();
return -1;
}
if (!s->data_to_read) {
s->data_to_read = ssh_socket_fd_isset(s, &rdes);
}
if (!s->data_to_write) {
s->data_to_write = ssh_socket_fd_isset(s, &wdes);
}
if (!s->data_except) {
s->data_except = ssh_socket_fd_isset(s, &edes);
}
*except = s->data_except;
*writeable = s->data_to_write;
leave_function();
return (s->data_to_read || (buffer_get_rest_len(s->in_buffer) > 0));
} }
#endif #endif
#ifdef USE_POLL #ifdef USE_POLL
/* ssh_socket_poll, poll() version */ /* ssh_socket_poll, poll() version */
int ssh_socket_poll(struct socket *s, int *writeable, int *except) { int ssh_socket_poll(struct socket *s, int *writeable, int *except) {
SSH_SESSION *session=s->session; SSH_SESSION *session = s->session;
struct pollfd fd[1]; struct pollfd fd[1];
int err; int rc = -1;
enter_function(); enter_function();
if(!ssh_socket_is_open(s)){
*except=1;
*writeable = 0;
return 0;
}
fd->fd=s->fd;
fd->events=0;
if(!s->data_to_read)
fd->events |= POLLIN;
if(!s->data_to_write)
fd->events |= POLLOUT;
/* Make the call, and listen for errors */ if (!ssh_socket_is_open(s)) {
err=poll(fd,1,0); *except = 1;
if(err<0){ *writeable = 0;
ssh_set_error(session,SSH_FATAL, "select: %s", strerror(errno)); return 0;
leave_function(); }
return -1;
} fd->fd = s->fd;
if(!s->data_to_read) fd->events = 0;
s->data_to_read=fd->revents & POLLIN;
if(!s->data_to_write) if (!s->data_to_read) {
s->data_to_write=fd->revents & POLLOUT; fd->events |= POLLIN;
if(!s->data_except) }
s->data_except=fd->revents & POLLERR; if (!s->data_to_write) {
*except=s->data_except; fd->events |= POLLOUT;
*writeable = s->data_to_write; }
/* Make the call, and listen for errors */
rc = poll(fd, 1, 0);
if (rc < 0) {
ssh_set_error(session, SSH_FATAL, "poll(): %s", strerror(errno));
leave_function(); leave_function();
return s->data_to_read || (buffer_get_rest_len(s->in_buffer)>0); return -1;
}
if (!s->data_to_read) {
s->data_to_read = fd->revents & POLLIN;
}
if (!s->data_to_write) {
s->data_to_write = fd->revents & POLLOUT;
}
if (!s->data_except) {
s->data_except = fd->revents & POLLERR;
}
*except = s->data_except;
*writeable = s->data_to_write;
leave_function();
return (s->data_to_read || (buffer_get_rest_len(s->in_buffer) > 0));
} }
#endif #endif