src/usr.bin/ssh/monitor_fdpass.c - diff

Return to monitor_fdpass.c CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/monitor_fdpass.c between version 1.18 and 1.19

version 1.18, 2008/11/30 11:59:26

version 1.19, 2010/01/12 00:58:25

Line 29

#include <sys/uio.h>

#include <errno.h>

#include <poll.h>

#include <string.h>

#include <stdarg.h>

Line 47

Line 48

struct iovec vec;

char ch = '\0';

ssize_t n;

struct pollfd pfd;

memset(&msg, 0, sizeof(msg));

msg.msg_control = (caddr_t)&cmsgbuf.buf;

Line 62

Line 64

msg.msg_iov = &vec;

msg.msg_iovlen = 1;

while ((n = sendmsg(sock, &msg, 0)) == -1 && (errno == EAGAIN ||

pfd.fd = sock;

errno == EINTR))

pfd.events = POLLOUT;

while ((n = sendmsg(sock, &msg, 0)) == -1 &&

(errno == EAGAIN || errno == EINTR)) {

debug3("%s: sendmsg(%d): %s", __func__, fd, strerror(errno));

(void)poll(&pfd, 1, -1);

}

if (n == -1) {

error("%s: sendmsg(%d): %s", __func__, fd,

strerror(errno));

Line 92

Line 98

ssize_t n;

char ch;

int fd;

struct pollfd pfd;

memset(&msg, 0, sizeof(msg));

vec.iov_base = &ch;

Line 101

Line 108

msg.msg_control = &cmsgbuf.buf;

msg.msg_controllen = sizeof(cmsgbuf.buf);

while ((n = recvmsg(sock, &msg, 0)) == -1 && (errno == EAGAIN ||

pfd.fd = sock;

errno == EINTR))

pfd.events = POLLIN;

while ((n = recvmsg(sock, &msg, 0)) == -1 &&

(errno == EAGAIN || errno == EINTR)) {

debug3("%s: recvmsg: %s", __func__, strerror(errno));

(void)poll(&pfd, 1, -1);

}

if (n == -1) {

error("%s: recvmsg: %s", __func__, strerror(errno));

return -1;