mirrors/looking-glass
2
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-13 04:27:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[client] cosmetics

Browse source
This commit is contained in:
Geoffrey McRae 2017-10-27 03:10:00 +11:00
parent b5ef81ff57
commit e6a01d5af0
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
client/spice/spice.c
View file

@ -66,7 +66,7 @@ struct Spice
// globals // globals
struct Spice spice = struct Spice spice =
{ {
.sessionID = 0, .sessionID = 0,
.scMain .connected = false, .scMain .connected = false,
.scMain .channelType = SPICE_CHANNEL_MAIN, .scMain .channelType = SPICE_CHANNEL_MAIN,
.scInputs.connected = false, .scInputs.connected = false,
@ -99,7 +99,7 @@ bool spice_connect(const char * host, const short port, const char * password)
spice.addr.sin_family = AF_INET; spice.addr.sin_family = AF_INET;
spice.addr.sin_port = htons(port); spice.addr.sin_port = htons(port);
spice.channelID = 0; spice.channelID = 0;
if (!spice_connect_channel(&spice.scMain)) if (!spice_connect_channel(&spice.scMain))
{ {
DEBUG_ERROR("connect main channel failed"); DEBUG_ERROR("connect main channel failed");
@ -224,11 +224,11 @@ bool spice_on_common_read(struct SpiceChannel * channel, SpiceDataHeader * heade
if (!channel->initDone) if (!channel->initDone)
{ {
*handled = false; *handled = false;
return true; return true;
} }
switch(header->type) switch(header->type)
{ {
case SPICE_MSG_MIGRATE: case SPICE_MSG_MIGRATE:
case SPICE_MSG_MIGRATE_DATA: case SPICE_MSG_MIGRATE_DATA:
{ {
@ -354,7 +354,7 @@ bool spice_on_main_channel_read()
DEBUG_ERROR("failed to set mouse mode"); DEBUG_ERROR("failed to set mouse mode");
return false; return false;
} }
if (!spice_connect_channel(&spice.scInputs)) if (!spice_connect_channel(&spice.scInputs))
{ {
DEBUG_ERROR("failed to connect inputs channel"); DEBUG_ERROR("failed to connect inputs channel");
@ -424,7 +424,7 @@ bool spice_on_inputs_channel_read()
DEBUG_PROTO("SPICE_MSG_INPUTS_MOUSE_MOTION_ACK"); DEBUG_PROTO("SPICE_MSG_INPUTS_MOUSE_MOTION_ACK");
return true; return true;
} }
} }
DEBUG_WARN("inputs channel unhandled message type %u", header.type); DEBUG_WARN("inputs channel unhandled message type %u", header.type);
spice_discard(channel, header.size); spice_discard(channel, header.size);
@ -446,7 +446,7 @@ bool spice_connect_channel(struct SpiceChannel * channel)
int flag = 1; int flag = 1;
setsockopt(channel->socket, IPPROTO_TCP, TCP_NODELAY, &flag, sizeof(int)); setsockopt(channel->socket, IPPROTO_TCP, TCP_NODELAY, &flag, sizeof(int));
if (connect(channel->socket, (const struct sockaddr *)&spice.addr, sizeof(spice.addr)) == -1) if (connect(channel->socket, (const struct sockaddr *)&spice.addr, sizeof(spice.addr)) == -1)
{ {
DEBUG_ERROR("socket connect failure"); DEBUG_ERROR("socket connect failure");
@ -563,7 +563,7 @@ bool spice_connect_channel(struct SpiceChannel * channel)
spice_disconnect_channel(channel); spice_disconnect_channel(channel);
return false; return false;
} }
if (linkResult != SPICE_LINK_ERR_OK) if (linkResult != SPICE_LINK_ERR_OK)
{ {
DEBUG_ERROR("connect code error %u", linkResult); DEBUG_ERROR("connect code error %u", linkResult);
@ -645,13 +645,13 @@ bool spice_read(const struct SpiceChannel * channel, void * buffer, const ssize_
{ {
DEBUG_ERROR("invalid buffer argument supplied"); DEBUG_ERROR("invalid buffer argument supplied");
return false; return false;
} }
ssize_t len = read(channel->socket, buffer, size); ssize_t len = read(channel->socket, buffer, size);
if (len != size) if (len != size)
{ {
DEBUG_ERROR("incomplete write"); DEBUG_ERROR("incomplete write");
return false; return false;
} }
return true; return true;