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

There isn't much point in doing lstat before connect so instead just do connect

Browse Source 
and handle ENOENT from it which is a little tidier.
This commit is contained in:
Nicholas Marriott 2009-11-02 13:41:25 +00:00
parent 992dd86309
commit 42fd44f1db
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
client.c
View File

@ -55,19 +55,6 @@ client_init(char *path, int cmdflags, int flags)
strlcpy(rpathbuf, path, sizeof rpathbuf); strlcpy(rpathbuf, path, sizeof rpathbuf);
setproctitle("client (%s)", rpathbuf); setproctitle("client (%s)", rpathbuf);
if (lstat(path, &sb) != 0) {
if (cmdflags & CMD_STARTSERVER && errno == ENOENT) {
if ((fd = server_start(path)) == -1)
goto start_failed;
goto server_started;
}
goto not_found;
}
if (!S_ISSOCK(sb.st_mode)) {
errno = ENOTSOCK;
goto not_found;
}
memset(&sa, 0, sizeof sa); memset(&sa, 0, sizeof sa);
sa.sun_family = AF_UNIX; sa.sun_family = AF_UNIX;
size = strlcpy(sa.sun_path, path, sizeof sa.sun_path); size = strlcpy(sa.sun_path, path, sizeof sa.sun_path);
@ -80,9 +67,14 @@ client_init(char *path, int cmdflags, int flags)
fatal("socket failed"); fatal("socket failed");
if (connect(fd, (struct sockaddr *) &sa, SUN_LEN(&sa)) == -1) { if (connect(fd, (struct sockaddr *) &sa, SUN_LEN(&sa)) == -1) {
if (errno == ECONNREFUSED) { if (!(cmdflags & CMD_STARTSERVER))
if (unlink(path) != 0 || !(cmdflags & CMD_STARTSERVER)) goto not_found;
switch (errno) {
case ECONNREFUSED:
if (unlink(path) != 0)
goto not_found; goto not_found;
/* FALLTHROUGH */
case ENOENT:
if ((fd = server_start(path)) == -1) if ((fd = server_start(path)) == -1)
goto start_failed; goto start_failed;
goto server_started; goto server_started;