mirror of https://github.com/xqemu/xqemu.git
ui/vnc : remove 'struct' of 'typedef struct'
Signed-off-by: Chih-Min Chao <cmchao@gmail.com> Reviewed-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
parent
494cb81741
commit
4769a881cb
|
@ -65,7 +65,7 @@ static void start_auth_vencrypt_subauth(VncState *vs)
|
||||||
|
|
||||||
static void vnc_tls_handshake_io(void *opaque);
|
static void vnc_tls_handshake_io(void *opaque);
|
||||||
|
|
||||||
static int vnc_start_vencrypt_handshake(struct VncState *vs)
|
static int vnc_start_vencrypt_handshake(VncState *vs)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
@ -103,7 +103,7 @@ static int vnc_start_vencrypt_handshake(struct VncState *vs)
|
||||||
|
|
||||||
static void vnc_tls_handshake_io(void *opaque)
|
static void vnc_tls_handshake_io(void *opaque)
|
||||||
{
|
{
|
||||||
struct VncState *vs = (struct VncState *)opaque;
|
VncState *vs = (VncState *)opaque;
|
||||||
|
|
||||||
VNC_DEBUG("Handshake IO continue\n");
|
VNC_DEBUG("Handshake IO continue\n");
|
||||||
vnc_start_vencrypt_handshake(vs);
|
vnc_start_vencrypt_handshake(vs);
|
||||||
|
|
10
ui/vnc-tls.c
10
ui/vnc-tls.c
|
@ -68,7 +68,7 @@ static int vnc_tls_initialize(void)
|
||||||
static ssize_t vnc_tls_push(gnutls_transport_ptr_t transport,
|
static ssize_t vnc_tls_push(gnutls_transport_ptr_t transport,
|
||||||
const void *data,
|
const void *data,
|
||||||
size_t len) {
|
size_t len) {
|
||||||
struct VncState *vs = (struct VncState *)transport;
|
VncState *vs = (VncState *)transport;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
retry:
|
retry:
|
||||||
|
@ -85,7 +85,7 @@ static ssize_t vnc_tls_push(gnutls_transport_ptr_t transport,
|
||||||
static ssize_t vnc_tls_pull(gnutls_transport_ptr_t transport,
|
static ssize_t vnc_tls_pull(gnutls_transport_ptr_t transport,
|
||||||
void *data,
|
void *data,
|
||||||
size_t len) {
|
size_t len) {
|
||||||
struct VncState *vs = (struct VncState *)transport;
|
VncState *vs = (VncState *)transport;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
retry:
|
retry:
|
||||||
|
@ -170,7 +170,7 @@ static gnutls_certificate_credentials_t vnc_tls_initialize_x509_cred(VncDisplay
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int vnc_tls_validate_certificate(struct VncState *vs)
|
int vnc_tls_validate_certificate(VncState *vs)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
unsigned int status;
|
unsigned int status;
|
||||||
|
@ -332,7 +332,7 @@ static int vnc_set_gnutls_priority(gnutls_session_t s, int x509)
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
int vnc_tls_client_setup(struct VncState *vs,
|
int vnc_tls_client_setup(VncState *vs,
|
||||||
int needX509Creds) {
|
int needX509Creds) {
|
||||||
VNC_DEBUG("Do TLS setup\n");
|
VNC_DEBUG("Do TLS setup\n");
|
||||||
if (vnc_tls_initialize() < 0) {
|
if (vnc_tls_initialize() < 0) {
|
||||||
|
@ -410,7 +410,7 @@ int vnc_tls_client_setup(struct VncState *vs,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void vnc_tls_client_cleanup(struct VncState *vs)
|
void vnc_tls_client_cleanup(VncState *vs)
|
||||||
{
|
{
|
||||||
if (vs->tls.session) {
|
if (vs->tls.session) {
|
||||||
gnutls_deinit(vs->tls.session);
|
gnutls_deinit(vs->tls.session);
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
#ifdef CONFIG_VNC_TLS
|
#ifdef CONFIG_VNC_TLS
|
||||||
#include "qemu/sockets.h"
|
#include "qemu/sockets.h"
|
||||||
|
|
||||||
static int vncws_start_tls_handshake(struct VncState *vs)
|
static int vncws_start_tls_handshake(VncState *vs)
|
||||||
{
|
{
|
||||||
int ret = gnutls_handshake(vs->tls.session);
|
int ret = gnutls_handshake(vs->tls.session);
|
||||||
|
|
||||||
|
@ -63,7 +63,7 @@ static int vncws_start_tls_handshake(struct VncState *vs)
|
||||||
|
|
||||||
void vncws_tls_handshake_io(void *opaque)
|
void vncws_tls_handshake_io(void *opaque)
|
||||||
{
|
{
|
||||||
struct VncState *vs = (struct VncState *)opaque;
|
VncState *vs = (VncState *)opaque;
|
||||||
|
|
||||||
if (!vs->tls.session) {
|
if (!vs->tls.session) {
|
||||||
VNC_DEBUG("TLS Websocket setup\n");
|
VNC_DEBUG("TLS Websocket setup\n");
|
||||||
|
|
2
ui/vnc.c
2
ui/vnc.c
|
@ -1046,7 +1046,7 @@ static void vnc_dpy_cursor_define(DisplayChangeListener *dcl,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static int find_and_clear_dirty_height(struct VncState *vs,
|
static int find_and_clear_dirty_height(VncState *vs,
|
||||||
int y, int last_x, int x, int height)
|
int y, int last_x, int x, int height)
|
||||||
{
|
{
|
||||||
int h;
|
int h;
|
||||||
|
|
Loading…
Reference in New Issue