Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-12-23 14:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] add unix socket support, fixes #67

Browse Source
This commit is contained in:
Geoffrey McRae 2018-05-23 12:16:44 +10:00
parent a3cd0385d0
commit 7a5bbb1e59
2 changed files with 59 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/main.c
View File

@ -1005,8 +1005,8 @@ void doHelp(char * app)
" -L SIZE Specify the size in MB of the shared memory file (0 = detect) [current: %d]\n" " -L SIZE Specify the size in MB of the shared memory file (0 = detect) [current: %d]\n"
"\n" "\n"
" -s Disable spice client\n" " -s Disable spice client\n"
" -c HOST Specify the spice host [current: %s]\n" " -c HOST Specify the spice host or UNIX socket [current: %s]\n"
" -p PORT Specify the spice port [current: %d]\n" " -p PORT Specify the spice port or 0 for UNIX socket [current: %d]\n"
" -j Disable cursor position scaling\n" " -j Disable cursor position scaling\n"
" -M Don't hide the host cursor\n" " -M Don't hide the host cursor\n"
"\n" "\n"
@ -1164,7 +1164,7 @@ static bool load_config(const char * configFile)
if (config_setting_lookup_int(spice, "port", &itmp)) if (config_setting_lookup_int(spice, "port", &itmp))
{ {
if (itmp < 1) if (itmp < 0 || itmp > 65535)
{ {
DEBUG_ERROR("Invalid spice port"); DEBUG_ERROR("Invalid spice port");
config_destroy(&cfg); config_destroy(&cfg);

60
client/spice/spice.c
View File

@ -29,6 +29,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/un.h>
#include <sys/select.h> #include <sys/select.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/tcp.h> #include <netinet/tcp.h>
@ -86,10 +87,19 @@ struct SpiceMouse
LG_Lock lock; LG_Lock lock;
}; };
union SpiceAddr
{
struct sockaddr addr;
struct sockaddr_in in;
struct sockaddr_in6 in6;
struct sockaddr_un un;
};
struct Spice struct Spice
{ {
char password[32]; char password[32];
struct sockaddr_in addr; short family;
union SpiceAddr addr;
uint32_t sessionID; uint32_t sessionID;
uint32_t channelID; uint32_t channelID;
@ -131,10 +141,23 @@ bool spice_discard (const struct SpiceChannel * channel, ssize_t size);
bool spice_connect(const char * host, const short port, const char * password) bool spice_connect(const char * host, const short port, const char * password)
{ {
strncpy(spice.password, password, sizeof(spice.password) - 1); strncpy(spice.password, password, sizeof(spice.password) - 1);
memset(&spice.addr, 0, sizeof(struct sockaddr_in)); memset(&spice.addr, 0, sizeof(spice.addr));
inet_pton(AF_INET, host, &spice.addr.sin_addr);
spice.addr.sin_family = AF_INET; if (port == 0)
spice.addr.sin_port = htons(port); {
spice.family = AF_UNIX;
spice.addr.un.sun_family = spice.family;
strncpy(spice.addr.un.sun_path, host, sizeof(spice.addr.un.sun_path) - 1);
DEBUG_INFO("Remote: %s", host);
}
else
{
spice.family = AF_INET;
inet_pton(spice.family, host, &spice.addr.in.sin_addr);
spice.addr.in.sin_family = spice.family;
spice.addr.in.sin_port = htons(port);
DEBUG_INFO("Remote: %s:%d", host, port);
}
LG_LOCK_INIT(spice.mouse.lock); LG_LOCK_INIT(spice.mouse.lock);
@ -504,14 +527,37 @@ bool spice_connect_channel(struct SpiceChannel * channel)
LG_LOCK_INIT(channel->lock); LG_LOCK_INIT(channel->lock);
channel->socket = socket(AF_INET, SOCK_STREAM, 0); size_t addrSize;
switch(spice.family)
{
case AF_UNIX:
addrSize = sizeof(spice.addr.un);
break;
case AF_INET:
addrSize = sizeof(spice.addr.in);
break;
case AF_INET6:
addrSize = sizeof(spice.addr.in6);
break;
default:
DEBUG_ERROR("Unsupported socket family");
return false;
}
channel->socket = socket(spice.family, SOCK_STREAM, 0);
if (channel->socket == -1) if (channel->socket == -1)
return false; return false;
if (spice.family != AF_UNIX)
{
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, &spice.addr.addr, addrSize) == -1)
{ {
DEBUG_ERROR("socket connect failure"); DEBUG_ERROR("socket connect failure");
close(channel->socket); close(channel->socket);