Browse Source

When connecting to a repeater, only send initialised string

Closes #253
pull/3/head
Christian Beier 4 years ago
parent
commit
8b06f835e2
No known key found for this signature in database
GPG Key ID: 421BB3B45C6067F8
  1. 10
      examples/repeater.c
  2. 8
      libvncclient/rfbproto.c

10
examples/repeater.c

@ -12,6 +12,7 @@ int main(int argc,char** argv)
char *repeaterHost;
int repeaterPort, sock;
char id[250];
int idlen;
rfbClientPtr cl;
int i,j;
@ -23,7 +24,12 @@ int main(int argc,char** argv)
"Usage: %s <id> <repeater-host> [<repeater-port>]\n", argv[0]);
exit(1);
}
snprintf(id, sizeof(id) - 1, "ID:%s", argv[1]);
idlen = snprintf(id, sizeof(id) - 1, "ID:%s", argv[1]);
if(idlen < 0 || idlen >= (int)sizeof(id)) {
fprintf(stderr, "Error, given ID is probably too long.\n");
return 1;
}
repeaterHost = argv[2];
repeaterPort = argc < 4 ? 5500 : atoi(argv[3]);
@ -48,7 +54,7 @@ int main(int argc,char** argv)
perror("connect to repeater");
return 1;
}
if (write(sock, id, sizeof(id)) != sizeof(id)) {
if (write(sock, id, idlen+1) != idlen+1) {
perror("writing id");
return 1;
}

8
libvncclient/rfbproto.c

@ -363,6 +363,7 @@ rfbBool ConnectToRFBRepeater(rfbClient* client,const char *repeaterHost, int rep
rfbProtocolVersionMsg pv;
int major,minor;
char tmphost[250];
int tmphostlen;
#ifdef LIBVNCSERVER_IPv6
client->sock = ConnectClientToTcpAddr6(repeaterHost, repeaterPort);
@ -398,8 +399,11 @@ rfbBool ConnectToRFBRepeater(rfbClient* client,const char *repeaterHost, int rep
rfbClientLog("Connected to VNC repeater, using protocol version %d.%d\n", major, minor);
snprintf(tmphost, sizeof(tmphost), "%s:%d", destHost, destPort);
if (!WriteToRFBServer(client, tmphost, sizeof(tmphost)))
tmphostlen = snprintf(tmphost, sizeof(tmphost), "%s:%d", destHost, destPort);
if(tmphostlen < 0 || tmphostlen >= (int)sizeof(tmphost))
return FALSE; /* snprintf error or output truncated */
if (!WriteToRFBServer(client, tmphost, tmphostlen + 1))
return FALSE;
return TRUE;

Loading…
Cancel
Save