diff options
| author | Pierre Ossman <ossman@cendio.se> | 2015-03-17 13:44:00 +0100 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2015-03-17 17:18:50 +0100 |
| commit | 79f82f95c1826b10fc39bc30ff1ecb00701557f7 (patch) | |
| tree | 04f805fe01d81797639c62b1a8bc5236b19c4d27 /win | |
| parent | 3aaaf66fb11d2a3b4abce5609f9995892fe66cad (diff) | |
| download | tigervnc-79f82f95c1826b10fc39bc30ff1ecb00701557f7.tar.gz tigervnc-79f82f95c1826b10fc39bc30ff1ecb00701557f7.zip | |
Local address change events are not socket specific
Diffstat (limited to 'win')
| -rw-r--r-- | win/rfb_win32/SocketManager.cxx | 2 | ||||
| -rw-r--r-- | win/rfb_win32/SocketManager.h | 2 | ||||
| -rw-r--r-- | win/winvnc/VNCServerWin32.cxx | 6 | ||||
| -rw-r--r-- | win/winvnc/VNCServerWin32.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/win/rfb_win32/SocketManager.cxx b/win/rfb_win32/SocketManager.cxx index d4f1965a..b073b8fb 100644 --- a/win/rfb_win32/SocketManager.cxx +++ b/win/rfb_win32/SocketManager.cxx @@ -174,7 +174,7 @@ void SocketManager::processEvent(HANDLE event) { vlog.info("deleting listening socket"); remListener(li.sock); } else if (network_events.lNetworkEvents & FD_ADDRESS_LIST_CHANGE) { - li.notifier->processAddressChange(li.sock); + li.notifier->processAddressChange(); requestAddressChangeEvents(li.sock); } else { vlog.error("unknown listener event: %lx", network_events.lNetworkEvents); diff --git a/win/rfb_win32/SocketManager.h b/win/rfb_win32/SocketManager.h index ef359749..c3c8fafd 100644 --- a/win/rfb_win32/SocketManager.h +++ b/win/rfb_win32/SocketManager.h @@ -48,7 +48,7 @@ namespace rfb { class AddressChangeNotifier { public: virtual ~AddressChangeNotifier() {} - virtual void processAddressChange(network::SocketListener* sl) = 0; + virtual void processAddressChange() = 0; }; // Add a listening socket. Incoming connections will be added to the supplied diff --git a/win/winvnc/VNCServerWin32.cxx b/win/winvnc/VNCServerWin32.cxx index 03899856..dbbf7c79 100644 --- a/win/winvnc/VNCServerWin32.cxx +++ b/win/winvnc/VNCServerWin32.cxx @@ -90,8 +90,8 @@ VNCServerWin32::~VNCServerWin32() { } -void VNCServerWin32::processAddressChange(network::SocketListener* sock_) { - if (!trayIcon || (sock_ != rfbSock.sock)) +void VNCServerWin32::processAddressChange() { + if (!trayIcon) return; // Tool-tip prefix depends on server mode @@ -144,7 +144,7 @@ void VNCServerWin32::regConfigChanged() { httpSock.setFilter(pattern.buf); // -=- Update the tray icon tooltip text with IP addresses - processAddressChange(rfbSock.sock); + processAddressChange(); } diff --git a/win/winvnc/VNCServerWin32.h b/win/winvnc/VNCServerWin32.h index 1feae368..b85814a4 100644 --- a/win/winvnc/VNCServerWin32.h +++ b/win/winvnc/VNCServerWin32.h @@ -82,7 +82,7 @@ namespace winvnc { // SocketManager::AddressChangeNotifier interface // Used to keep tray icon up to date - virtual void processAddressChange(network::SocketListener* sl); + virtual void processAddressChange(); // RegConfig::Callback interface // Called via the EventManager whenver RegConfig sees the registry change |