src/usr.bin/ssh/sftp-server.c - diff

Return to sftp-server.c CVS log

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

version 1.72, 2007/04/18 01:12:43

version 1.73, 2007/05/17 07:55:29

Line 1193

int in, out, max, ch, skipargs = 0, log_stderr = 0;

ssize_t len, olen, set_size;

SyslogFacility log_facility = SYSLOG_FACILITY_AUTH;

char *cp;

char *cp, buf[4*4096];

extern char *optarg;

extern char *__progname;

Line 1271

memset(rset, 0, set_size);

memset(wset, 0, set_size);

FD_SET(in, rset);

* Ensure that we can read a full buffer and handle

* the worst-case length packet it can generate,

* otherwise apply backpressure by stopping reads.

if (buffer_check_alloc(&iqueue, sizeof(buf)) &&

buffer_check_alloc(&oqueue, SFTP_MAX_MSG_LENGTH))

FD_SET(in, rset);

olen = buffer_len(&oqueue);

if (olen > 0)

FD_SET(out, wset);

Line 1285

Line 1293

/* copy stdin to iqueue */

if (FD_ISSET(in, rset)) {

char buf[4*4096];

len = read(in, buf, sizeof buf);

if (len == 0) {

debug("read eof");

Line 1307

Line 1314

buffer_consume(&oqueue, len);

}

/* process requests from client */

process();

* Process requests from client if we can fit the results

* into the output buffer, otherwise stop processing input

* and let the output queue drain.

if (buffer_check_alloc(&oqueue, SFTP_MAX_MSG_LENGTH))

process();

}