*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-keyscan.c,v 1.12 2001/02/04 15:32:26 stevesk Exp $");
+RCSID("$OpenBSD: ssh-keyscan.c,v 1.22 2001/03/06 06:11:18 deraadt Exp $");
#if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H)
#include <sys/queue.h>
#else
-#include "fake-queue.h"
+#include "openbsd-compat/fake-queue.h"
#endif
#include <errno.h>
#include "buffer.h"
#include "bufaux.h"
#include "log.h"
+#include "atomicio.h"
static int argno = 1; /* Number of argument currently being parsed */
int timeout = 5;
int maxfd;
-#define maxcon (maxfd - 10)
+#define MAXCON (maxfd - 10)
#ifdef HAVE___PROGNAME
extern char *__progname;
#else
char *__progname;
#endif
-fd_set read_wait;
+fd_set *read_wait;
+size_t read_wait_size;
int ncon;
/*
void (*errfun) (const char *,...);
} Linebuf;
-static inline Linebuf *
+Linebuf *
Linebuf_alloc(const char *filename, void (*errfun) (const char *,...))
{
Linebuf *lb;
return (lb);
}
-static inline void
+void
Linebuf_free(Linebuf * lb)
{
fclose(lb->stream);
xfree(lb);
}
-static inline void
+void
Linebuf_restart(Linebuf * lb)
{
clearerr(lb->stream);
lb->lineno = 0;
}
-static inline int
+int
Linebuf_lineno(Linebuf * lb)
{
return (lb->lineno);
}
-static inline char *
-getline(Linebuf * lb)
+char *
+Linebuf_getline(Linebuf * lb)
{
int n = 0;
/* Read a line */
if (!fgets(&lb->buf[n], lb->size - n, lb->stream)) {
if (ferror(lb->stream) && lb->errfun)
- (*lb->errfun) ("%s: %s\n", lb->filename, strerror(errno));
+ (*lb->errfun) ("%s: %s\n", lb->filename,
+ strerror(errno));
return (NULL);
}
n = strlen(lb->buf);
}
if (n != lb->size - 1) {
if (lb->errfun)
- (*lb->errfun) ("%s: skipping incomplete last line\n", lb->filename);
+ (*lb->errfun) ("%s: skipping incomplete last line\n",
+ lb->filename);
return (NULL);
}
/* Double the buffer if we need more space */
if (!(lb->buf = realloc(lb->buf, (lb->size *= 2)))) {
if (lb->errfun)
- (*lb->errfun) ("linebuf (%s): realloc failed\n", lb->filename);
+ (*lb->errfun) ("linebuf (%s): realloc failed\n",
+ lb->filename);
return (NULL);
}
}
}
-static int
+int
fdlim_get(int hard)
{
#if defined(HAVE_GETRLIMIT) && defined(RLIMIT_NOFILE)
struct rlimit rlfd;
+
if (getrlimit(RLIMIT_NOFILE, &rlfd) < 0)
return (-1);
if ((hard ? rlfd.rlim_max : rlfd.rlim_cur) == RLIM_INFINITY)
#endif
}
-static int
+int
fdlim_set(int lim)
{
#if defined(HAVE_SETRLIMIT) && defined(RLIMIT_NOFILE)
* separators. This is the same as the 4.4BSD strsep, but different from the
* one in the GNU libc.
*/
-inline char *
+char *
xstrsep(char **str, const char *delim)
{
char *s, *e;
gettimeofday(&fdcon[s].c_tv, NULL);
fdcon[s].c_tv.tv_sec += timeout;
TAILQ_INSERT_TAIL(&tq, &fdcon[s], c_link);
- FD_SET(s, &read_wait);
+ FD_SET(s, read_wait);
ncon++;
return (s);
}
void
confree(int s)
{
- close(s);
if (s >= maxfd || fdcon[s].c_status == CS_UNUSED)
fatal("confree: attempt to free bad fdno %d", s);
+ close(s);
xfree(fdcon[s].c_namebase);
xfree(fdcon[s].c_output_name);
if (fdcon[s].c_status == CS_KEYS)
xfree(fdcon[s].c_data);
fdcon[s].c_status = CS_UNUSED;
TAILQ_REMOVE(&tq, &fdcon[s], c_link);
- FD_CLR(s, &read_wait);
+ FD_CLR(s, read_wait);
ncon--;
}
void
congreet(int s)
{
- char buf[80];
- int n;
+ char buf[80], *cp;
+ size_t bufsiz;
+ int n = 0;
con *c = &fdcon[s];
- n = read(s, buf, sizeof(buf));
+ bufsiz = sizeof(buf);
+ cp = buf;
+ while (bufsiz-- && (n = read(s, cp, 1)) == 1 && *cp != '\n' && *cp != '\r')
+ cp++;
if (n < 0) {
if (errno != ECONNREFUSED)
error("read (%s): %s", c->c_name, strerror(errno));
conrecycle(s);
return;
}
- if (buf[n - 1] != '\n') {
+ if (*cp != '\n' && *cp != '\r') {
error("%s: bad greeting", c->c_name);
confree(s);
return;
}
- buf[n - 1] = '\0';
+ *cp = '\0';
fprintf(stderr, "# %s %s\n", c->c_name, buf);
n = snprintf(buf, sizeof buf, "SSH-1.5-OpenSSH-keyscan\r\n");
- if (write(s, buf, n) != n) {
+ if (atomicio(write, s, buf, n) != n) {
error("write (%s): %s", c->c_name, strerror(errno));
confree(s);
return;
void
conloop(void)
{
- fd_set r, e;
+ fd_set *r, *e;
struct timeval seltime, now;
int i;
con *c;
gettimeofday(&now, NULL);
c = tq.tqh_first;
- if (c &&
- (c->c_tv.tv_sec > now.tv_sec ||
- (c->c_tv.tv_sec == now.tv_sec && c->c_tv.tv_usec > now.tv_usec))) {
+ if (c && (c->c_tv.tv_sec > now.tv_sec ||
+ (c->c_tv.tv_sec == now.tv_sec && c->c_tv.tv_usec > now.tv_usec))) {
seltime = c->c_tv;
seltime.tv_sec -= now.tv_sec;
seltime.tv_usec -= now.tv_usec;
- if ((int) seltime.tv_usec < 0) {
+ if (seltime.tv_usec < 0) {
seltime.tv_usec += 1000000;
seltime.tv_sec--;
}
} else
seltime.tv_sec = seltime.tv_usec = 0;
- r = e = read_wait;
- select(maxfd, &r, NULL, &e, &seltime);
- for (i = 0; i < maxfd; i++)
- if (FD_ISSET(i, &e)) {
+ r = xmalloc(read_wait_size);
+ memcpy(r, read_wait, read_wait_size);
+ e = xmalloc(read_wait_size);
+ memcpy(e, read_wait, read_wait_size);
+
+ while (select(maxfd, r, NULL, e, &seltime) == -1 &&
+ (errno == EAGAIN || errno == EINTR))
+ ;
+
+ for (i = 0; i < maxfd; i++) {
+ if (FD_ISSET(i, e)) {
error("%s: exception!", fdcon[i].c_name);
confree(i);
- } else if (FD_ISSET(i, &r))
+ } else if (FD_ISSET(i, r))
conread(i);
+ }
+ xfree(r);
+ xfree(e);
c = tq.tqh_first;
- while (c &&
- (c->c_tv.tv_sec < now.tv_sec ||
- (c->c_tv.tv_sec == now.tv_sec && c->c_tv.tv_usec < now.tv_usec))) {
+ while (c && (c->c_tv.tv_sec < now.tv_sec ||
+ (c->c_tv.tv_sec == now.tv_sec && c->c_tv.tv_usec < now.tv_usec))) {
int s = c->c_fd;
+
c = c->c_link.tqe_next;
conrecycle(s);
}
return (argv[argno++]);
} else if (!strncmp(argv[argno], "-f", 2)) {
char *fname;
+
if (argv[argno][2])
fname = &argv[argno++][2];
else if (++argno >= argc) {
fname = NULL;
lb = Linebuf_alloc(fname, error);
} else
- error("ignoring invalid/misplaced option `%s'", argv[argno++]);
+ error("ignoring invalid/misplaced option `%s'",
+ argv[argno++]);
} else {
char *line;
- line = getline(lb);
+
+ line = Linebuf_getline(lb);
if (line)
return (line);
Linebuf_free(lb);
}
}
-static void
+void
usage(void)
{
fatal("usage: %s [-t timeout] { [--] host | -f file } ...", __progname);
fatal("%s: fdlim_get: bad value", __progname);
if (maxfd > MAXMAXFD)
maxfd = MAXMAXFD;
- if (maxcon <= 0)
+ if (MAXCON <= 0)
fatal("%s: not enough file descriptors", __progname);
if (maxfd > fdlim_get(0))
fdlim_set(maxfd);
fdcon = xmalloc(maxfd * sizeof(con));
+ memset(fdcon, 0, maxfd * sizeof(con));
+
+ read_wait_size = howmany(maxfd, NFDBITS) * sizeof(fd_mask);
+ read_wait = xmalloc(read_wait_size);
+ memset(read_wait, 0, read_wait_size);
do {
- while (ncon < maxcon) {
+ while (ncon < MAXCON) {
char *name;
host = nexthost(argc, argv);
andersk / openssh.git / blobdiff