Skip to content

Commit

Permalink
don't enable local sockets by default on win32
Browse files Browse the repository at this point in the history
as some random errors have been reported with them
  • Loading branch information
totaam committed Nov 24, 2022
1 parent 66eeba7 commit d30df6d
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions xpra/client/mixins/network_listener.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import sys

from xpra.version_util import version_str
from xpra.util import envint, envfloat, typedict, DETACH_REQUEST, PROTOCOL_ERROR
from xpra.os_util import bytestostr, get_machine_id
from xpra.util import envint, envfloat, envbool, typedict, DETACH_REQUEST, PROTOCOL_ERROR
from xpra.os_util import bytestostr, get_machine_id, WIN32
from xpra.net.bytestreams import log_new_connection
from xpra.net.socket_util import create_sockets, add_listen_socket, accept_connection, setup_local_sockets
from xpra.net.net_util import get_network_caps
Expand All @@ -24,6 +24,7 @@
SOCKET_TIMEOUT = envfloat("XPRA_CLIENT_SOCKET_TIMEOUT", "0.1")
MAX_CONCURRENT_CONNECTIONS = envint("XPRA_MAX_CONCURRENT_CONNECTIONS", 5)
REQUEST_TIMEOUT = envint("XPRA_CLIENT_REQUEST_TIMEOUT", 10)
WIN32_LOCAL_SOCKETS = envbool("XPRA_WIN32_LOCAL_SOCKETS", False)


class NetworkListener(StubClientMixin):
Expand All @@ -47,7 +48,7 @@ def init(self, opts):
def err(msg):
raise InitException(msg)
self.sockets = create_sockets(opts, err)
if opts.bind:
if opts.bind and (not WIN32 or WIN32_LOCAL_SOCKETS or opts.bind!="auto"):
try:
local_sockets = setup_local_sockets(opts.bind,
None, opts.client_socket_dirs,
Expand Down

0 comments on commit d30df6d

Please sign in to comment.