diff options
| author |   djm <djm@openbsd.org> | 2016-03-07 19:02:43 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2016-03-07 19:02:43 +0000 |
| commit | 1667b834089972f87df60db7feef35bbf760a6fd (patch) | |
| tree | a4e6c871eda706efb994781026d7ebc3964eabab /usr.bin/ssh/serverloop.c | |
| parent | Make cp -i behave as mv -i or rm -i, independently of whether stdin (diff) | |
| download | wireguard-openbsd-1667b834089972f87df60db7feef35bbf760a6fd.tar.xz wireguard-openbsd-1667b834089972f87df60db7feef35bbf760a6fd.zip | |
refactor canohost.c: move functions that cache results closer to the
places that use them (authn and session code). After this, no state is
cached in canohost.c
feedback and ok markus@
Diffstat (limited to 'usr.bin/ssh/serverloop.c')
| -rw-r--r-- | usr.bin/ssh/serverloop.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c index 83ccd1e6e27..2461702f6f4 100644 --- a/usr.bin/ssh/serverloop.c +++ b/usr.bin/ssh/serverloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: serverloop.c,v 1.183 2016/03/04 03:35:44 djm Exp $ */ +/* $OpenBSD: serverloop.c,v 1.184 2016/03/07 19:02:43 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -379,6 +379,7 @@ wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp, int *maxfdp, static void process_input(fd_set *readset) { + struct ssh *ssh = active_state; /* XXX */ int len; char buf[16384]; @@ -386,8 +387,8 @@ process_input(fd_set *readset) if (FD_ISSET(connection_in, readset)) { len = read(connection_in, buf, sizeof(buf)); if (len == 0) { - verbose("Connection closed by %.100s", - get_remote_ipaddr()); + verbose("Connection closed by %.100s port %d", + ssh_remote_ipaddr(ssh), ssh_remote_port(ssh)); connection_closed = 1; if (compat20) return; @@ -395,8 +396,9 @@ process_input(fd_set *readset) } else if (len < 0) { if (errno != EINTR && errno != EAGAIN) { verbose("Read error from remote host " - "%.100s: %.100s", - get_remote_ipaddr(), strerror(errno)); + "%.100s port %d: %.100s", + ssh_remote_ipaddr(ssh), + ssh_remote_port(ssh), strerror(errno)); cleanup_exit(255); } } else { |