kill BackChannel and CustomClientMessage: the new extension technique makes these hooks obsolete

4 files changed, 1 insertions, 52 deletions

diff --git a/libvncserver/main.c b/libvncserver/main.c
index 240d50d..e6908e1 100644
--- a/libvncserver/main.c
+++ b/libvncserver/main.c
@@ -596,11 +596,6 @@ static enum rfbNewClientAction rfbDefaultNewClientHook(rfbClientPtr cl)
 	return RFB_CLIENT_ACCEPT;
 }
 
-static rfbBool rfbDefaultProcessCustomClientMessage(rfbClientPtr cl,uint8_t type)
-{
-	return FALSE;
-}
-
 /*
  * Update server's pixel format in screenInfo structure. This
  * function is called from rfbGetScreen() and rfbNewFramebuffer().
@@ -745,7 +740,6 @@ rfbScreenInfoPtr rfbGetScreen(int* argc,char** argv,
    screen->setTranslateFunction = rfbSetTranslateFunction;
    screen->newClientHook = rfbDefaultNewClientHook;
    screen->displayHook = NULL;
-   screen->processCustomClientMessage = rfbDefaultProcessCustomClientMessage;
 
    /* initialize client list and iterator mutex */
    rfbClientListInit(screen);
diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c
index 53ec4f8..652b1b7 100644
--- a/libvncserver/rfbserver.c
+++ b/libvncserver/rfbserver.c
@@ -889,15 +889,6 @@ rfbProcessClientNormalMessage(rfbClientPtr cl)
 		    cl->useNewFBSize = TRUE;
 		}
 		break;
-#ifdef LIBVNCSERVER_BACKCHANNEL
-	    case rfbEncodingBackChannel:
-	        if (!cl->enableBackChannel) {
-		    rfbLog("Enabling BackChannel protocol extension for "
-			   "client %s\n", cl->host);
-		    cl->enableBackChannel = TRUE;
-		}
-		break;
-#endif
 #ifdef LIBVNCSERVER_HAVE_LIBZ
            case rfbEncodingZRLE:
                if (cl->preferredEncoding == -1) {
@@ -1128,13 +1119,6 @@ rfbProcessClientNormalMessage(rfbClientPtr cl)
 		e = next;
 	    }
 
-	    if(cl->screen->processCustomClientMessage(cl,msg.type)) {
-		rfbLog("Warning: this program uses processCustomClientMessage, "
-			"which is deprecated.\n"
-			"Please use rfbRegisterProtocolExtension instead.\n");
-		return;
-	    }
-
 	    rfbLog("rfbProcessClientNormalMessage: unknown message type %d\n",
 		    msg.type);
 	    rfbLog(" ... closing connection\n");
@@ -1857,30 +1841,4 @@ rfbProcessUDPInput(rfbScreenInfoPtr rfbScreen)
     }
 }
 
-#ifdef LIBVNCSERVER_BACKCHANNEL
-void rfbSendBackChannel(rfbScreenInfoPtr rfbScreen,char* str,int len)
-{
-    rfbClientPtr cl;
-    rfbBackChannelMsg sct;
-    rfbClientIteratorPtr iterator;
 
-    iterator = rfbGetClientIterator(rfbScreen);
-    while ((cl = rfbClientIteratorNext(iterator)) != NULL) {
-        if (cl->enableBackChannel) {
-	    sct.type = rfbBackChannel;
-	    sct.length = Swap32IfLE(len);
-	    if (rfbWriteExact(cl, (char *)&sct,
-			   sz_rfbBackChannelMsg) < 0) {
-	        rfbLogPerror("rfbSendBackChannel: write");
-		rfbCloseClient(cl);
-		continue;
-	    }
-	    if (rfbWriteExact(cl, str, len) < 0) {
-	        rfbLogPerror("rfbSendBackChannel: write");
-		rfbCloseClient(cl);
-	    }
-	}
-    }
-    rfbReleaseClientIterator(iterator);
-}
-#endif
diff --git a/libvncserver/stats.c b/libvncserver/stats.c
index cd1bd40..969eeed 100755
--- a/libvncserver/stats.c
+++ b/libvncserver/stats.c
@@ -30,11 +30,7 @@ static const char* encNames[] = {
     "raw", "copyRect", "RRE", "[encoding 3]", "CoRRE", "hextile",
     "zlib", "tight", "[encoding 8]", "[encoding 9]", "[encoding 10]",
     "[encoding 11]", "[encoding 12]", "[encoding 13]", "[encoding 14]",
-#ifdef LIBVNCSERVER_BACKCHANNEL
-    "BackChannel",
-#else
     "[encoding 15]",
-#endif
     "ZRLE", "[encoding 17]", "[encoding 18]", "[encoding 19]", "[encoding 20]"
 };
 
diff --git a/libvncserver/tightvnc-filetransfer/filetransfermsg.c b/libvncserver/tightvnc-filetransfer/filetransfermsg.c
index 6a3a39e..e7f6476 100644
--- a/libvncserver/tightvnc-filetransfer/filetransfermsg.c
+++ b/libvncserver/tightvnc-filetransfer/filetransfermsg.c
@@ -319,6 +319,7 @@ GetFileDownloadResponseMsgInBlocks(rfbClientPtr cl, rfbTightClientPtr rtcp)
 		}
 	return CreateFileDownloadBlockSizeDataMsg(numOfBytesRead, pBuf);
 	}
+	return GetFileDownLoadErrMsg();
 }