From e568b91f04bbd5e49dc8720f5b9314c624ee84ab Mon Sep 17 00:00:00 2001 From: Nicolas Viennot Date: Sun, 25 Aug 2019 03:53:26 -0400 Subject: [PATCH] Improved messages --- docker-entrypoint.sh | 2 +- tmate-ssh-server.c | 2 ++ tmate-websocket.c | 14 +++++++------- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 72c744a2..d1cdccb9 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -2,7 +2,7 @@ set -e if [ "${USE_PROXY_PROTOCOL}" == "1" ]; then - set -- -x + set -- -x "$@" fi if [ "${HAS_WEBSOCKET}" == "1" ]; then diff --git a/tmate-ssh-server.c b/tmate-ssh-server.c index 11b158ab..51c10034 100644 --- a/tmate-ssh-server.c +++ b/tmate-ssh-server.c @@ -341,6 +341,8 @@ static int get_client_ip_proxy_protocol(int fd, char *dst, size_t len) read_single_line(fd, header, sizeof(header)); + tmate_debug("proxy header: %s", header); + int tok_num = 0; for (char *tok = strtok(header, " "); tok; tok = strtok(NULL, " "), tok_num++) { if (tok_num == 1) diff --git a/tmate-websocket.c b/tmate-websocket.c index 85b501b3..2bd2045f 100644 --- a/tmate-websocket.c +++ b/tmate-websocket.c @@ -341,16 +341,16 @@ static void on_websocket_encoder_write(void *userdata, struct evbuffer *buffer) websocket_out = bufferevent_get_output(session->bev_websocket); if (evbuffer_add_buffer(websocket_out, buffer) < 0) - tmate_fatal("Cannot write to websocket buffer"); + tmate_fatal("Cannot write to websocket server buffer"); } static void on_websocket_event_default(__unused struct tmate_session *session, short events) { if (events & BEV_EVENT_EOF) - tmate_fatal("Connection to websocket closed"); + tmate_fatal("Connection to websocket server closed"); if (events & BEV_EVENT_ERROR) - tmate_fatal("Connection to websocket error: %s", + tmate_fatal("Connection to websocket server error: %s", evutil_socket_error_to_string(EVUTIL_SOCKET_ERROR())); } @@ -405,18 +405,18 @@ static int _tmate_connect_to_websocket(const char *hostname, int port) servaddr.sin_port = htons(port); if (connect(sockfd, (struct sockaddr*)&servaddr, sizeof(servaddr)) < 0) - tmate_fatal("Cannot connect to websocket at %s:%d", hostname, port); + tmate_fatal("Cannot connect to websocket server at %s:%d", hostname, port); { int flag = 1; if (setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, &flag, sizeof(flag)) < 0) - tmate_fatal("Can't set websocket socket to TCP_NODELAY"); + tmate_fatal("Can't set websocket server socket to TCP_NODELAY"); } if (fcntl(sockfd, F_SETFL, O_NONBLOCK) < 0) - tmate_fatal("Can't set websocket socket to non-blocking"); + tmate_fatal("Can't set websocket server socket to non-blocking"); - tmate_notice("Connected to websocket at %s:%d", hostname, port); + tmate_notice("Connected to websocket server at %s:%d", hostname, port); return sockfd; }