summaryrefslogtreecommitdiffstats
path: root/x11vnc/scan.c
diff options
context:
space:
mode:
authorrunge <runge>2007-06-15 03:19:05 +0000
committerrunge <runge>2007-06-15 03:19:05 +0000
commitd3326942e2e7d1391da0975590dbd2c8668d9328 (patch)
tree34da35ee116fc657d51736ff65fc0b02b3826801 /x11vnc/scan.c
parent171db9c542cd35b6de8ad88cefd99ea145482df1 (diff)
downloadlibvncserver-d3326942e2e7d1391da0975590dbd2c8668d9328.zip
libvncserver-d3326942e2e7d1391da0975590dbd2c8668d9328.tar.gz
x11vnc: fix build error if libssl is missing or --without-ssl supplied.
Diffstat (limited to 'x11vnc/scan.c')
-rw-r--r--x11vnc/scan.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/x11vnc/scan.c b/x11vnc/scan.c
index 4f3b5e7..74dec2b 100644
--- a/x11vnc/scan.c
+++ b/x11vnc/scan.c
@@ -2704,8 +2704,13 @@ static void ping_clients(int tile_cnt) {
rfbLog("reset rfbMaxClientWait to %d msec.\n",
rfbMaxClientWait);
}
- if (tile_cnt) {
+ if (tile_cnt > 0) {
last_send = now;
+ } else if (tile_cnt < 0) {
+ if (now >= last_send - tile_cnt) {
+ mark_rect_as_modified(0, 0, 1, 1, 1);
+ last_send = now;
+ }
} else if (now - last_send > 2) {
/* Send small heartbeat to client */
mark_rect_as_modified(0, 0, 1, 1, 1);
@@ -3344,6 +3349,8 @@ if (tile_count) fprintf(stderr, "XX copytile: %.4f tile_count: %d\n", dnow() -
/* Work around threaded rfbProcessClientMessage() calls timeouts */
if (use_threads) {
ping_clients(tile_diffs);
+ } else if (saw_ultra_chat || saw_ultra_file) {
+ ping_clients(-1);
} else if (use_openssl && !tile_diffs) {
ping_clients(0);
}
OpenPOWER on IntegriCloud