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

agent: Use ssh_poll in agent code.

Browse Source
This commit is contained in:
Andreas Schneider
2010-06-17 13:21:22 +02:00
parent 22d975a24b
commit 601081ebb6
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libssh/agent.c
View File

@@ -41,7 +41,6 @@
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include <poll.h>
#include <unistd.h> #include <unistd.h>
#ifndef _WIN32 #ifndef _WIN32
@@ -54,6 +53,7 @@
#include "libssh/buffer.h" #include "libssh/buffer.h"
#include "libssh/session.h" #include "libssh/session.h"
#include "libssh/keys.h" #include "libssh/keys.h"
#include "libssh/poll.h"
/* macro to check for "agent failure" message */ /* macro to check for "agent failure" message */
#define agent_failed(x) \ #define agent_failed(x) \
@@ -86,7 +86,7 @@ static size_t atomicio(struct socket *s, void *buf, size_t n, int do_read) {
size_t pos = 0; size_t pos = 0;
ssize_t res; ssize_t res;
struct pollfd pfd; struct pollfd pfd;
int fd = ssh_socket_get_fd(s); socket_t fd = ssh_socket_get_fd(s);
pfd.fd = fd; pfd.fd = fd;
pfd.events = do_read ? POLLIN : POLLOUT; pfd.events = do_read ? POLLIN : POLLOUT;
@@ -107,7 +107,7 @@ static size_t atomicio(struct socket *s, void *buf, size_t n, int do_read) {
#else #else
if (errno == EAGAIN) { if (errno == EAGAIN) {
#endif #endif
(void) poll(&pfd, 1, -1); (void) ssh_poll(&pfd, 1, -1);
continue; continue;
} }
return 0; return 0;