Windows support for Unix Domain Sockets

Author: asfernandes

builds/cmake/Configure.cmake

@@ -116,6 +116,7 @@ set(CASE_SENSITIVITY "true")
 set(SUPPORT_RAW_DEVICES 1)
 
 set(include_files_list
+    afunix.h
     aio.h
     assert.h
     atomic.h

builds/install/misc/firebird.conf

@@ -783,9 +783,9 @@
 
 # ----------------------------
 # Unix domain socket path to be used for client database and service
-# connections on POSIX platforms. If set, the server listens on this
-# socket instead of the TCP service name/port. The name should not
-# contain colons.
+# connections on platforms with Unix domain socket support. If set,
+# the server listens on this socket instead of the TCP service name/port.
+# The name should not contain colons, except for a Windows drive letter.
 #
 # Event notification connections use a separate Unix domain socket in
 # the same directory as this socket. Firebird chooses its name as

configure.ac

@@ -893,7 +893,7 @@ AC_CHECK_HEADERS(iconv.h)
 AC_CHECK_HEADERS(linux/falloc.h)
 AC_CHECK_HEADERS(utime.h)
 
-AC_CHECK_HEADERS(socket.h sys/socket.h sys/sockio.h sys/un.h winsock2.h)
+AC_CHECK_HEADERS(afunix.h socket.h sys/socket.h sys/sockio.h sys/un.h winsock2.h)
 AC_CHECK_DECLS(SOCK_CLOEXEC,,,[[
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>

doc/Firebird_conf.txt

@@ -142,7 +142,7 @@ DeadThreadsCollection      integer  default 50
 PriorityBoost              integer  default 5
 RemoteServiceName          string   default gds_db
 RemoteServicePort          integer  default 3050 (TCP port number)
-RemoteServiceUnixSocket    string   default empty (Unix domain socket path, POSIX only)
+RemoteServiceUnixSocket    string   default empty (Unix domain socket path)
 IpcName                    string   default "FIREBIRD" (Windows only)
 
 MaxUnflushedWrites         integer

doc/README.connection_strings

@@ -110,11 +110,12 @@ Examples:
     inet://C:\db\mydb.fdb
     inet://mydb
 
-  Local connection via Unix domain socket (POSIX only):
+  Local connection via Unix domain socket:
 
     unix:///run/firebird/firebird.sock:/db/mydb.fdb
     unix:///run/firebird/firebird.sock:mydb
     unix:///run/firebird/firebird.sock:service_mgr
+    unix://C:\firebird\firebird.sock:C:\db\mydb.fdb
 
   Local connection via shared memory:
 
@@ -146,5 +147,6 @@ to connect locally using a specific transport protocol, please specify:
   xnet://<file path to database or alias>
 
 Note: XNET (shared memory) protocol is available on Windows only.
-Unix domain socket protocol is available on POSIX only and the socket path
-must not contain ':'.
+Unix domain socket protocol is available on platforms with AF_UNIX support.
+The socket path must not contain ':' except for a Windows drive letter, as in
+unix://C:\firebird\firebird.sock:C:\db\mydb.fdb.

src/include/gen/autoconfig.h.in

@@ -330,6 +330,9 @@
 /* Define to 1 if you have the <sys/signal.h> header file. */
 #cmakedefine HAVE_SYS_SIGNAL_H 1
 
+/* Define to 1 if you have the <afunix.h> header file. */
+#cmakedefine HAVE_AFUNIX_H 1
+
 /* Define to 1 if you have the <sys/socket.h> header file. */
 #cmakedefine HAVE_SYS_SOCKET_H 1
 

src/include/gen/autoconfig_msvc.h

@@ -92,6 +92,7 @@
 #endif
 
 /* Headers */
+#define HAVE_AFUNIX_H
 #define HAVE_ASSERT_H
 #define HAVE_CTYPE_H
 #undef HAVE_UNISTD_H

src/remote/client/interface.cpp

@@ -87,9 +87,14 @@
 #endif
 
 #ifdef WIN_NT
+#include <winsock2.h>
 #include <process.h>
 #endif
 
+#if (defined(WIN_NT) && defined(HAVE_AFUNIX_H)) || defined(HAVE_SYS_UN_H)
+#define HAVE_AF_UNIX_SUPPORT
+#endif
+
 #if defined(WIN_NT)
 #include "../common/isc_proto.h"
 #include "../remote/os/win32/xnet_proto.h"
@@ -100,7 +105,7 @@ const char* const PROTOCOL_INET = "inet";
 const char* const PROTOCOL_INET4 = "inet4";
 const char* const PROTOCOL_INET6 = "inet6";
 
-#if !defined(WIN_NT) && defined(HAVE_SYS_UN_H)
+#ifdef HAVE_AF_UNIX_SUPPORT
 const char* const PROTOCOL_UNIX = "unix";
 #endif
 
@@ -1178,7 +1183,7 @@ static void authReceiveResponse(bool havePacket, ClntAuthBlock& authItr, rem_por
 
 static AtomicCounter remote_event_id;
 
-#if !defined(WIN_NT) && defined(HAVE_SYS_UN_H)
+#ifdef HAVE_AF_UNIX_SUPPORT
 static bool analyzeUnixProtocol(PathName& expandedName, PathName& nodeName)
 {
 	nodeName.erase();
@@ -1194,7 +1199,17 @@ static bool analyzeUnixProtocol(PathName& expandedName, PathName& nodeName)
 	PathName savedName = expandedName;
 	expandedName.erase(0, prefix.length());
 
-	const PathName::size_type separator = expandedName.find(':');
+	PathName::size_type separator = expandedName.find(':');
+
+#ifdef WIN_NT
+	if (separator == 1)
+	{
+		const char driveLetter = expandedName[0];
+		if ((driveLetter >= 'A' && driveLetter <= 'Z') || (driveLetter >= 'a' && driveLetter <= 'z'))
+			separator = expandedName.find(':', separator + 1);
+	}
+#endif
+
 	if (separator == PathName::npos || separator == 0 || separator == expandedName.length() - 1)
 	{
 		expandedName = savedName;
@@ -7962,7 +7977,7 @@ static rem_port* analyze(ClntAuthBlock& cBlock, PathName& attach_name, unsigned
 			else
 #endif
 
-#if !defined(WIN_NT) && defined(HAVE_SYS_UN_H)
+#ifdef HAVE_AF_UNIX_SUPPORT
 			if (analyzeUnixProtocol(attach_name, node_name))
 			{
 				ISC_utf8ToSystem(node_name);