diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-04-27 14:00:57 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-04-27 14:00:57 +0200 |
| commit | 2137ee7e2cfea258f3184208691acb1d6d8b5ba7 (patch) | |
| tree | a5c9561b419cb278af6f5b27181a5b62496a8f50 /nxcomp/ServerProxy.h | |
| parent | b326eda7328e95200f7d70efde35ce51a14bab3d (diff) | |
| parent | 3713346f3959782c5e5d1ddd0252f25fb319d732 (diff) | |
| download | nx-libs-2137ee7e2cfea258f3184208691acb1d6d8b5ba7.tar.gz nx-libs-2137ee7e2cfea258f3184208691acb1d6d8b5ba7.tar.bz2 nx-libs-2137ee7e2cfea258f3184208691acb1d6d8b5ba7.zip | |
Merge branch 'sunweaver-pr/nxcomp-unix-sockets-for-channels' into 3.6.x
Diffstat (limited to 'nxcomp/ServerProxy.h')
| -rw-r--r-- | nxcomp/ServerProxy.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/nxcomp/ServerProxy.h b/nxcomp/ServerProxy.h index 54bc0f748..cc8191795 100644 --- a/nxcomp/ServerProxy.h +++ b/nxcomp/ServerProxy.h @@ -24,6 +24,7 @@ #include "Proxy.h" #include "Misc.h" +#include "ChannelEndPoint.h" // // Set the verbosity level. @@ -43,8 +44,11 @@ class ServerProxy : public Proxy virtual void handleDisplayConfiguration(const char *xServerDisplay, int xServerAddrFamily, sockaddr *xServerAddr, unsigned int xServerAddrLength); - virtual void handlePortConfiguration(int cupsServerPort, int smbServerPort, int mediaServerPort, - int httpServerPort, const char *fontServerPort); + virtual void handlePortConfiguration(ChannelEndPoint &cupsServerPort, + ChannelEndPoint &smbServerPort, + ChannelEndPoint &mediaServerPort, + ChannelEndPoint &httpServerPort, + const char *fontServerPort); protected: @@ -108,6 +112,7 @@ class ServerProxy : public Proxy private: + // FIXME: Use a ChannelEndPoint object also for the X server! int xServerAddrFamily_; sockaddr *xServerAddr_; unsigned int xServerAddrLength_; @@ -124,10 +129,10 @@ class ServerProxy : public Proxy // TCP connections. // - int cupsServerPort_; - int smbServerPort_; - int mediaServerPort_; - int httpServerPort_; + ChannelEndPoint cupsServerPort_; + ChannelEndPoint smbServerPort_; + ChannelEndPoint mediaServerPort_; + ChannelEndPoint httpServerPort_; // // It will have to be passed to the channel |