v/tmate-ssh-server
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate-ssh-server.git synced 2020-11-18 19:53:51 -08:00
Code Issues Releases Wiki Activity

Improved messages

Browse Source
This commit is contained in:
Nicolas Viennot 2019-08-25 03:53:26 -04:00
parent 4555d8d6fb
commit e568b91f04
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker-entrypoint.sh
View File

@ -2,7 +2,7 @@
set -e set -e
if [ "${USE_PROXY_PROTOCOL}" == "1" ]; then if [ "${USE_PROXY_PROTOCOL}" == "1" ]; then
set -- -x set -- -x "$@"
fi fi
if [ "${HAS_WEBSOCKET}" == "1" ]; then if [ "${HAS_WEBSOCKET}" == "1" ]; then

2
tmate-ssh-server.c
View File

@ -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)); read_single_line(fd, header, sizeof(header));
tmate_debug("proxy header: %s", header);
int tok_num = 0; int tok_num = 0;
for (char *tok = strtok(header, " "); tok; tok = strtok(NULL, " "), tok_num++) { for (char *tok = strtok(header, " "); tok; tok = strtok(NULL, " "), tok_num++) {
if (tok_num == 1) if (tok_num == 1)

14
tmate-websocket.c
View File

@ -341,16 +341,16 @@ static void on_websocket_encoder_write(void *userdata, struct evbuffer *buffer)
websocket_out = bufferevent_get_output(session->bev_websocket); websocket_out = bufferevent_get_output(session->bev_websocket);
if (evbuffer_add_buffer(websocket_out, buffer) < 0) 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) static void on_websocket_event_default(__unused struct tmate_session *session, short events)
{ {
if (events & BEV_EVENT_EOF) if (events & BEV_EVENT_EOF)
tmate_fatal("Connection to websocket closed"); tmate_fatal("Connection to websocket server closed");
if (events & BEV_EVENT_ERROR) 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())); 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); servaddr.sin_port = htons(port);
if (connect(sockfd, (struct sockaddr*)&servaddr, sizeof(servaddr)) < 0) 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; int flag = 1;
if (setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, &flag, sizeof(flag)) < 0) 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) 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; return sockfd;
} }