diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2017-12-05 01:30:19 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2017-12-07 11:46:35 +1100 |
| commit | 927f8514ceffb1af380a5f63ab4d3f7709b1b198 (patch) | |
| tree | 5e99a5d62bcc3b0215df7b7a8120f5614b760d9a /channels.c | |
| parent | a8c89499543e2d889629c4e5e8dcf47a655cf889 (diff) | |
| download | openssh-git-927f8514ceffb1af380a5f63ab4d3f7709b1b198.tar.gz | |
upstream commit
include the addr:port in bind/listen failure messages
OpenBSD-Commit-ID: fdadb69fe1b38692608809cf0376b71c2c28e58e
Diffstat (limited to 'channels.c')
| -rw-r--r-- | channels.c | 13 |
1 files changed, 9 insertions, 4 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: channels.c,v 1.376 2017/10/25 00:15:35 djm Exp $ */ +/* $OpenBSD: channels.c,v 1.377 2017/12/05 01:30:19 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -3351,7 +3351,8 @@ channel_setup_fwd_listener_tcpip(struct ssh *ssh, int type, sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); if (sock < 0) { /* this is no error since kernel may not support ipv6 */ - verbose("socket: %.100s", strerror(errno)); + verbose("socket [%s]:%s: %.100s", ntop, strport, + strerror(errno)); continue; } @@ -3369,9 +3370,11 @@ channel_setup_fwd_listener_tcpip(struct ssh *ssh, int type, * already bound */ if (!ai->ai_next) - error("bind: %.100s", strerror(errno)); + error("bind [%s]:%s: %.100s", + ntop, strport, strerror(errno)); else - verbose("bind: %.100s", strerror(errno)); + verbose("bind [%s]:%s: %.100s", + ntop, strport, strerror(errno)); close(sock); continue; @@ -3379,6 +3382,8 @@ channel_setup_fwd_listener_tcpip(struct ssh *ssh, int type, /* Start listening for connections on the socket. */ if (listen(sock, SSH_LISTEN_BACKLOG) < 0) { error("listen: %.100s", strerror(errno)); + error("listen [%s]:%s: %.100s", ntop, strport, + strerror(errno)); close(sock); continue; } |