From 3713346f3959782c5e5d1ddd0252f25fb319d732 Mon Sep 17 00:00:00 2001 From: Salvador Fandino Date: Wed, 20 Apr 2016 16:22:56 +0200 Subject: Provide support for channel endpoints being UNIX file sockets in addition to being TCP/IP sockets. --- nxcomp/ClientProxy.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'nxcomp/ClientProxy.cpp') diff --git a/nxcomp/ClientProxy.cpp b/nxcomp/ClientProxy.cpp index ef63bb0eb..7dd3dbbc6 100644 --- a/nxcomp/ClientProxy.cpp +++ b/nxcomp/ClientProxy.cpp @@ -68,8 +68,11 @@ void ClientProxy::handleDisplayConfiguration(const char *xServerDisplay, int xSe #endif } -void ClientProxy::handlePortConfiguration(int cupsServerPort, int smbServerPort, int mediaServerPort, - int httpServerPort, const char *fontServerPort) +void ClientProxy::handlePortConfiguration(ChannelEndPoint &cupsServerPort, + ChannelEndPoint &smbServerPort, + ChannelEndPoint &mediaServerPort, + ChannelEndPoint &httpServerPort, + const char *fontServerPort) { delete [] fontServerPort_; @@ -141,8 +144,8 @@ int ClientProxy::handleNewConnectionFromProxy(T_channel_type type, int channelId // Connect on the TCP port number. // - return handleNewGenericConnectionFromProxy(channelId, channel_font, "localhost", - port, "font"); + return handleNewGenericConnectionFromProxyTCP(channelId, channel_font, "localhost", + port, "font"); } else { @@ -150,7 +153,7 @@ int ClientProxy::handleNewConnectionFromProxy(T_channel_type type, int channelId // Connect to the Unix path. // - return handleNewGenericConnectionFromProxy(channelId, channel_font, "localhost", + return handleNewGenericConnectionFromProxyUnix(channelId, channel_font, fontServerPort_, "font"); } } -- cgit v1.2.3