diff options
| author | Salvador Fandino <sfandino@yahoo.com> | 2016-04-20 16:22:56 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-04-27 13:59:34 +0200 |
| commit | 3713346f3959782c5e5d1ddd0252f25fb319d732 (patch) | |
| tree | a5c9561b419cb278af6f5b27181a5b62496a8f50 /nxcomp/ClientProxy.cpp | |
| parent | b326eda7328e95200f7d70efde35ce51a14bab3d (diff) | |
| download | nx-libs-3713346f3959782c5e5d1ddd0252f25fb319d732.tar.gz nx-libs-3713346f3959782c5e5d1ddd0252f25fb319d732.tar.bz2 nx-libs-3713346f3959782c5e5d1ddd0252f25fb319d732.zip | |
Provide support for channel endpoints being UNIX file sockets in addition to being TCP/IP sockets.
Diffstat (limited to 'nxcomp/ClientProxy.cpp')
| -rw-r--r-- | nxcomp/ClientProxy.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
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"); } } |