pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-01-04 00:06:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

client: rename connect_unsecure to connect_to_peer

Browse Source 
Both connect_secure() and connect_unsecure() call connect_to_peer().

Prior to this commit spicec.log reported all connections as unsecure,
as connect_secure() called connect_unsecure() to make the connection.
This fixes RH bug #653545
This commit is contained in:
Uri Lublin 2011-07-08 13:24:34 +02:00 committed by Christophe Fergeau
parent 492f7a9b84
commit 082431ba8d
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
client/red_peer.cpp
View File

@ -68,7 +68,7 @@ void RedPeer::cleanup()
}
}
void RedPeer::connect_unsecure(const char* host, int portnr)
void RedPeer::connect_to_peer(const char* host, int portnr)
{
struct addrinfo ai, *result = NULL, *e;
char uaddr[INET6_ADDRSTRLEN+1];
@ -104,7 +104,8 @@ void RedPeer::connect_unsecure(const char* host, int portnr)
getnameinfo((struct sockaddr*)e->ai_addr, e->ai_addrlen,
uaddr,INET6_ADDRSTRLEN, uport,32,
NI_NUMERICHOST | NI_NUMERICSERV);
LOG_INFO("Trying %s %s", uaddr, uport);
DBG(0, "Trying %s %s", uaddr, uport);
if (::connect(_peer, e->ai_addr, e->ai_addrlen) == SOCKET_ERROR) {
err = sock_error();
LOG_INFO("Connect failed: %s (%d)",
@ -113,7 +114,7 @@ void RedPeer::connect_unsecure(const char* host, int portnr)
_peer = INVALID_SOCKET;
continue;
}
LOG_INFO("Connected to %s %s", uaddr, uport);
DBG(0, "Connected to %s %s", uaddr, uport);
break;
}
lock.unlock();
@ -130,14 +131,23 @@ void RedPeer::connect_unsecure(const char* host, int portnr)
}
}
void RedPeer::connect_unsecure(const char* host, int portnr)
{
connect_to_peer(host, portnr);
ASSERT(_ctx == NULL && _ssl == NULL && _peer != INVALID_SOCKET);
LOG_INFO("Connected to %s %d", host, portnr);
}
void RedPeer::connect_secure(const ConnectionOptions& options, const char* host)
{
int return_code;
SPICE_SSL_VERIFY_OP auth_flags;
SpiceOpenSSLVerify* verify = NULL;
int portnr = options.secure_port;
connect_unsecure(host, options.secure_port);
connect_to_peer(host, portnr);
ASSERT(_ctx == NULL && _ssl == NULL && _peer != INVALID_SOCKET);
LOG_INFO("Connected to %s %d", host, portnr);
try {
#if OPENSSL_VERSION_NUMBER >= 0x10000000L

1
client/red_peer.h
View File

@ -123,6 +123,7 @@ protected:
void cleanup();
private:
void connect_to_peer(const char* host, int port);
void shutdown();
private: