diff options
| author | Pierre Ossman <ossman@cendio.se> | 2018-05-04 12:44:31 +0200 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2018-05-29 16:44:48 +0200 |
| commit | 559e8b885444de35f78598c59a36fd6bfc088592 (patch) | |
| tree | aaa35a7416b7d8fec6f1d1b17cf11760bde5d7b6 /unix | |
| parent | d7bbbbf07ffaca2573974ca5b2fbfd1faf22a08a (diff) | |
| download | tigervnc-559e8b885444de35f78598c59a36fd6bfc088592.tar.gz tigervnc-559e8b885444de35f78598c59a36fd6bfc088592.zip | |
Merge common socket code
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/xserver/hw/vnc/RFBGlue.cc | 2 | ||||
| -rw-r--r-- | unix/xserver/hw/vnc/vncExtInit.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/unix/xserver/hw/vnc/RFBGlue.cc b/unix/xserver/hw/vnc/RFBGlue.cc index c09dfe6c..160177bd 100644 --- a/unix/xserver/hw/vnc/RFBGlue.cc +++ b/unix/xserver/hw/vnc/RFBGlue.cc @@ -192,7 +192,7 @@ void vncListParams(int width, int nameWidth) int vncGetSocketPort(int fd) { - return network::TcpSocket::getSockPort(fd); + return network::getSockPort(fd); } int vncIsTCPPortUsed(int port) diff --git a/unix/xserver/hw/vnc/vncExtInit.cc b/unix/xserver/hw/vnc/vncExtInit.cc index 4d96ca0d..e4135b3c 100644 --- a/unix/xserver/hw/vnc/vncExtInit.cc +++ b/unix/xserver/hw/vnc/vncExtInit.cc @@ -179,7 +179,7 @@ void vncExtensionInit(void) std::list<network::SocketListener*> listeners; std::list<network::SocketListener*> httpListeners; if (scr == 0 && vncInetdSock != -1) { - if (network::TcpSocket::isListening(vncInetdSock)) + if (network::isSocketListening(vncInetdSock)) { listeners.push_back(new network::TcpListener(vncInetdSock)); vlog.info("inetd wait"); |