pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2025-12-26 22:48:19 +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 Alon Levy
parent edce17a574
commit c685a3d4eb
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
client/red_peer.cpp
View File

@ -70,7 +70,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];
@ -106,7 +106,7 @@ 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)",
@ -115,7 +115,7 @@ void RedPeer::connect_unsecure(const char* host, int portnr)
_peer = -1;
continue;
}
LOG_INFO("Connected to %s %s", uaddr, uport);
DBG(0, "Connected to %s %s", uaddr, uport);
break;
}
lock.unlock();
@ -132,6 +132,13 @@ 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);
}
bool RedPeer::verify_pubkey(X509* cert, const HostAuthOptions::PublicKey& key)
{
EVP_PKEY* cert_pubkey = NULL;
@ -472,9 +479,11 @@ void RedPeer::connect_secure(const ConnectionOptions& options, const char* host)
int return_code;
int auth_flags;
SslVerifyCbData auth_data;
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

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