The great UltraVNC Compatibility Commit

1 files changed, 4 insertions, 7 deletions

diff --git a/x11vnc/rates.c b/x11vnc/rates.c
index 811a7ae..d6f1c5c 100644
--- a/x11vnc/rates.c
+++ b/x11vnc/rates.c
@@ -350,11 +350,8 @@ db = 0;
 		}
 		nclients++;
 
-		cbs = 0;
-		for (i=0; i<MAX_ENCODINGS; i++) {
-			cbs += cl->bytesSent[i];
-		}
-		rbs = cl->rawBytesEquivalent;
+		cbs = rfbStatGetSentBytes(cl);
+		rbs = rfbStatGetSentBytesIfRaw(cl);
 
 		if (init) {
 
@@ -435,7 +432,7 @@ if (db) fprintf(stderr, "%d client num rects req: %d  mod: %d  cbs: %d  "
 
 if (db) fprintf(stderr, "dt2 calc: num rects req: %d/%d mod: %d/%d  "
     "fbu-sent: %d  dt: %.4f dt2: %.4f  tm: %.4f\n",
-    req0, req1, mod0, mod1, cl->framebufferUpdateMessagesSent, dt, dt2, tm);
+    req0, req1, mod0, mod1, rfbStatGetMessageCountSent(cl, rfbFramebufferUpdate), dt, dt2, tm);
 			if (req1 != 0 && mod1 == 0) {
 				got_t2 = 1;
 				break;
@@ -502,7 +499,7 @@ if (db) fprintf(stderr, "dt2 calc: num rects req: %d/%d mod: %d/%d  "
 
 if (db) fprintf(stderr, "dt3 calc: num rects req: %d/%d mod: %d/%d  "
     "fbu-sent: %d  dt: %.4f dt3: %.4f  tm: %.4f\n",
-    req0, req1, mod0, mod1, cl->framebufferUpdateMessagesSent, dt, dt3, tm);
+    req0, req1, mod0, mod1, rfbStatGetMessageCountSent(cl, rfbFramebufferUpdate), dt, dt3, tm);
 
 					if (req1 != 0 && mod1 == 0) {
 						dts[got_t3++] = dt3;