diff options
Diffstat (limited to 'libvncserver')
| -rw-r--r-- | libvncserver/rfbssl_gnutls.c | 2 | ||||
| -rwxr-xr-x | libvncserver/websockets.c | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/libvncserver/rfbssl_gnutls.c b/libvncserver/rfbssl_gnutls.c index 66f4bc8..0689c01 100644 --- a/libvncserver/rfbssl_gnutls.c +++ b/libvncserver/rfbssl_gnutls.c @@ -60,7 +60,7 @@ static int rfbssl_init_session(struct rfbssl_ctx *ctx, int fd) /* */ } else { gnutls_session_enable_compatibility_mode(session); - gnutls_transport_set_ptr(session, (gnutls_transport_ptr_t)fd); + gnutls_transport_set_ptr(session, (gnutls_transport_ptr_t)(uintptr_t)fd); ctx->session = session; } return ret; diff --git a/libvncserver/websockets.c b/libvncserver/websockets.c index 777c3d8..4d35226 100755 --- a/libvncserver/websockets.c +++ b/libvncserver/websockets.c @@ -166,7 +166,6 @@ min (int a, int b) { return a < b ? a : b; } - void webSocketsGenSha1Key(char * target, int size, char *key) { @@ -709,7 +708,7 @@ webSocketsDecodeHybi(rfbClientPtr cl, char *dst, int len) rfbErr("%s: read; %m", __func__); return ret; } else if (ret < total) { - /* TODO: hmm? */ + /* GT TODO: hmm? */ rfbLog("%s: read; got partial data\n", __func__); } else { buf[ret] = '\0'; @@ -748,7 +747,7 @@ webSocketsDecodeHybi(rfbClientPtr cl, char *dst, int len) result = flength; break; default: - rfbErr("unhandled opcode %d, b0: %02x, b1: %02x\n", (int)opcode, header->b0, header->b1); + rfbErr("%s: unhandled opcode %d, b0: %02x, b1: %02x\n", __func__, (int)opcode, header->b0, header->b1); } /* single point of return, if someone has questions :-) */ @@ -833,8 +832,8 @@ webSocketsDecode(rfbClientPtr cl, char *dst, int len) } -/* returns TRUE if client sent an close frame or a single end of marker - * was received, FALSE otherwise +/* returns TRUE if client sent a close frame or a single 'end of frame' + * marker was received, FALSE otherwise * * Note: This is a Hixie-only hack! **/ |