Conditionally use af_unix and fileio

Author: bilby91

authfd.c

@@ -97,7 +97,13 @@ ssh_get_authentication_socket_path(const char *authsocket, int *fdp)
 	sunaddr.sun_family = AF_UNIX;
 	strlcpy(sunaddr.sun_path, authsocket, sizeof(sunaddr.sun_path));
 
-	if ((sock = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
+	#ifdef HAVE_AFUNIX_H
+	sock = w32_afunix_socket(&sunaddr);
+	#else
+	sock = socket(AF_UNIX, SOCK_STREAM, 0);
+	#endif
+
+	if (sock == -1)
 		return SSH_ERR_SYSTEM_ERROR;
 
 	/* close on exec */

contrib/win32/openssh/config.h.vs

@@ -1526,6 +1526,9 @@
 /* Use PIPES instead of a socketpair() */
 #define USE_PIPES 1
 
+/* Define name for the ssh-agent Windows named pipe */
+#define AGENT_PIPE_ID L"\\\\.\\pipe\\openssh-ssh-agent"
+
 /* define 1 if afunix.h is available */
 #define HAVE_AFUNIX_H 1
 

contrib/win32/win32compat/ssh-agent/agent.c

@@ -43,8 +43,6 @@ HANDLE sshagent_client_primary_token;
 static HANDLE ioc_port = NULL;
 static BOOL debug_mode = FALSE;
 
-#define AGENT_PIPE_ID L"\\\\.\\pipe\\openssh-ssh-agent"
-
 static HANDLE event_stop_agent;
 static OVERLAPPED ol;
 static 	HANDLE pipe;

contrib/win32/win32compat/w32fd.c

@@ -300,12 +300,6 @@ w32_socket(int domain, int type, int protocol)
 	if (min_index == -1)
 		return -1;
 
-	#ifdef HAVE_AFUNIX_H
-	pio = socketio_socket(domain, type, protocol);
-	if (pio == NULL)
-		return -1;
-	pio->type = SOCK_FD;
-	#else
 	if (domain == AF_UNIX && type == SOCK_STREAM) {
 		pio = fileio_afunix_socket();
 		if (pio == NULL)
@@ -317,7 +311,65 @@ w32_socket(int domain, int type, int protocol)
 			return -1;
 		pio->type = SOCK_FD;
 	}
+
+	fd_table_set(pio, min_index);
+	debug4("socket:%d, socktype:%d, io:%p, fd:%d ", pio->sock, type, pio, min_index);
+	return min_index;
+}
+
+int
+w32_afunix_socket(struct sockaddr_un* addr)
+{
+	#ifdef HAVE_AFUNIX_H
+	/*
+		If HAVE_AFUNIX_H is defined, we can be dealing with the ssh-agent named pipe or
+		a AF_UNIX socket if ssh forwarding is enabled. If the addr->sun_path is the
+		the well known named pipe, we open the socket with w32_fileio.
+	*/
+	if(strcmp(addr->sun_path, "\\\\.\\pipe\\openssh-ssh-agent") == 0)
+		return w32_fileio_socket(SOCK_STREAM, 0);
+	else
+		return w32_unix_socket(SOCK_STREAM, 0);
+	#else
+		return w32_socket(AF_UNIX, SOCK_STREAM, 0);
 	#endif
+}
+
+int
+w32_unix_socket(int type, int protocol)
+{
+	int domain = AF_UNIX;
+	int min_index = fd_table_get_min_index();
+	struct w32_io* pio = NULL;
+
+	errno = 0;
+	if (min_index == -1)
+		return -1;
+
+	pio = socketio_socket(domain, type, protocol);
+	if (pio == NULL)
+		return -1;
+	pio->type = SOCK_FD;
+
+	fd_table_set(pio, min_index);
+	debug4("socket:%d, socktype:%d, io:%p, fd:%d ", pio->sock, type, pio, min_index);
+	return min_index;
+}
+
+int
+w32_fileio_socket(int type, int protocol)
+{
+	int min_index = fd_table_get_min_index();
+	struct w32_io* pio = NULL;
+
+	errno = 0;
+	if (min_index == -1)
+		return -1;
+
+	pio = fileio_afunix_socket();
+	if (pio == NULL)
+		return -1;
+	pio->type = NONSOCK_FD;
 
 	fd_table_set(pio, min_index);
 	debug4("socket:%d, socktype:%d, io:%p, fd:%d ", pio->sock, type, pio, min_index);

contrib/win32/win32compat/w32fd.h

@@ -125,6 +125,7 @@ struct w32_io {
 #define FILETYPE(pio) (GetFileType(WINHANDLE(pio)))
 extern HANDLE main_thread;
 
+int w32_afunix_socket(struct sockaddr_un* addr);
 BOOL w32_io_is_blocking(struct w32_io*);
 BOOL w32_io_is_io_available(struct w32_io* pio, BOOL rd);
 int wait_for_any_event(HANDLE* events, int num_events, DWORD milli_seconds);

misc.c

@@ -1928,7 +1928,11 @@ unix_listener(const char *path, int backlog, int unlink_first)
 		return -1;
 	}
 
+	#ifdef HAVE_AFUNIX_H
+	sock = w32_afunix_socket(&sunaddr);
+	#else
 	sock = socket(PF_UNIX, SOCK_STREAM, 0);
+	#endif
 	if (sock == -1) {
 		saved_errno = errno;
 		error_f("socket: %.100s", strerror(errno));

mux.c

@@ -2268,7 +2268,13 @@ muxclient(const char *path)
 		fatal("ControlPath too long ('%s' >= %u bytes)", path,
 		    (unsigned int)sizeof(addr.sun_path));
 
-	if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) == -1)
+	#ifdef HAVE_AFUNIX_H
+	sock = w32_afunix_socket(&addr);
+	#elif
+	sock = socket(PF_UNIX, SOCK_STREAM, 0);
+	#endif
+
+	if (sock == -1)
 		fatal_f("socket(): %s", strerror(errno));
 
 	if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) == -1) {