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

nits

Browse Source
This commit is contained in:
Nicolas Viennot 2019-11-10 12:55:45 -05:00
parent 90c3b571d3
commit f132989294
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -28,7 +28,7 @@ RUN set -ex; \
### Minimal run-time image ### Minimal run-time image
FROM alpine:3.9 FROM alpine:3.9
RUN apk add --no-cache msgpack-c ncurses-libs libevent libexecinfo openssl zlib RUN apk add --no-cache msgpack-c ncurses-libs libevent libexecinfo openssl zlib gdb bash
COPY --from=build /usr/lib/libssh.so.* /usr/lib/ COPY --from=build /usr/lib/libssh.so.* /usr/lib/
COPY --from=build /usr/bin/tmate-ssh-server /usr/bin/ COPY --from=build /usr/bin/tmate-ssh-server /usr/bin/

3
server.c
View File

@ -222,7 +222,8 @@ server_loop(void)
* This causes an infinite loop. * This causes an infinite loop.
* The following check is a workaround to avoid the infinite loop. * The following check is a workaround to avoid the infinite loop.
*/ */
tmate_fatal("SSH socket not connected, but socket close wasn't detected"); tmate_info("SSH socket not connected, but socket close wasn't detected");
request_server_termination();
} }
if (!tmate_server_request_exit) if (!tmate_server_request_exit)

2
tmate-daemon-decoder.c
View File

@ -45,7 +45,7 @@ static void tmate_header(struct tmate_session *session,
session->daemon_encoder.mpac_version = 4; session->daemon_encoder.mpac_version = 4;
} }
tmate_info("Daemon header: version=%s, protocol=%d", tmate_info("tmate version=%s, protocol=%d",
session->client_version, session->client_protocol_version); session->client_version, session->client_protocol_version);
if (tmate_has_websocket()) { if (tmate_has_websocket()) {

2
tmate-main.c
View File

@ -174,7 +174,7 @@ char *get_socket_path(const char *_token)
for (char *c = token; *c; c++) { for (char *c = token; *c; c++) {
if (*c == '/' || *c == '.') if (*c == '/' || *c == '.')
*c = '_'; *c = '=';
} }
xasprintf(&path, TMATE_WORKDIR "/sessions/%s", token); xasprintf(&path, TMATE_WORKDIR "/sessions/%s", token);

3
tmate-ssh-daemon.c
View File

@ -156,8 +156,7 @@ void tmate_spawn_daemon(struct tmate_session *session)
set_session_token(session, token); set_session_token(session, token);
free(token); free(token);
tmate_info("Spawning daemon username=%s ip=%s", tmate_info("Spawning daemon ip=%s", client->ip_address);
client->username, client->ip_address);
session->tmux_socket_fd = server_create_socket(); session->tmux_socket_fd = server_create_socket();
if (session->tmux_socket_fd < 0) if (session->tmux_socket_fd < 0)