RPJosh
/
wlvncc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove vncrec suppport

pull/23/head
Andri Yngvason 2022-10-23 18:15:37 +00:00
parent 087a78e551
commit 232bcadd4a
3 changed files with 1 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/rfbclient.h
View File

@ -235,7 +235,7 @@ typedef struct _rfbClient {
const char* programName;
char* serverHost;
int serverPort; /**< if -1, then use file recorded by vncrec */
int serverPort;
rfbBool listenSpecified;
int listenPort, flashPort;

61
src/rfbproto.c
View File

@ -286,39 +286,6 @@ static rfbBool IsUnixSocket(const char* name)
rfbBool ConnectToRFBServer(rfbClient* client, const char* hostname, int port)
{
if (client->serverPort == -1) {
/* serverHost is a file recorded by vncrec. */
const char* magic = "vncLog0.0";
char buffer[10];
rfbVNCRec* rec = (rfbVNCRec*)malloc(sizeof(rfbVNCRec));
if (!rec) {
rfbClientLog("Could not allocate rfbVNCRec memory\n");
return FALSE;
}
client->vncRec = rec;
rec->file = fopen(client->serverHost, "rb");
rec->tv.tv_sec = 0;
rec->readTimestamp = FALSE;
rec->doNotSleep = FALSE;
if (!rec->file) {
rfbClientLog("Could not open %s.\n", client->serverHost);
return FALSE;
}
setbuf(rec->file, NULL);
if (fread(buffer, 1, strlen(magic), rec->file) != strlen(magic) ||
strncmp(buffer, magic, strlen(magic))) {
rfbClientLog("File %s was not recorded by vncrec.\n",
client->serverHost);
fclose(rec->file);
return FALSE;
}
client->sock = RFB_INVALID_SOCKET;
return TRUE;
}
if (IsUnixSocket(hostname))
/* serverHost is a UNIX socket. */
client->sock = ConnectClientToUnixSockWithTimeout(
@ -582,36 +549,10 @@ static rfbBool ReadSupportedSecurityType(rfbClient* client, uint32_t* result,
static rfbBool HandleVncAuth(rfbClient* client)
{
uint8_t challenge[CHALLENGESIZE];
char* passwd = NULL;
int i;
if (!ReadFromRFBServer(client, (char*)challenge, CHALLENGESIZE))
return FALSE;
if (client->serverPort != -1) { /* if not playing a vncrec file */
if (client->GetPassword)
passwd = client->GetPassword(client);
if ((!passwd) || (strlen(passwd) == 0)) {
rfbClientLog("Reading password failed\n");
return FALSE;
}
if (strlen(passwd) > 8) {
passwd[8] = '\0';
}
rfbClientEncryptBytes(challenge, passwd);
/* Lose the password from memory */
for (i = strlen(passwd); i >= 0; i--) {
passwd[i] = '\0';
}
free(passwd);
if (!WriteToRFBServer(client, (char*)challenge, CHALLENGESIZE))
return FALSE;
}
/* Handle the SecurityResult message */
if (!rfbHandleAuthResult(client))
return FALSE;
@ -2431,8 +2372,6 @@ rfbBool HandleRFBServerMessage(rfbClient* client)
{
rfbServerToClientMsg msg;
if (client->serverPort == -1)
client->vncRec->readTimestamp = TRUE;
if (!ReadFromRFBServer(client, (char*)&msg, 1))
return FALSE;

3
src/sockets.c
View File

@ -111,9 +111,6 @@ WriteToRFBServer(rfbClient* client, const char *buf, unsigned int n)
int err;
#endif /* LIBVNCSERVER_HAVE_SASL */
if (client->serverPort==-1)
return TRUE; /* vncrec playing */
if (client->tlsSession) {
/* WriteToTLS() will guarantee either everything is written, or error/eof returns */
i = WriteToTLS(client, buf, n);