summaryrefslogtreecommitdiffstats
path: root/client/red_peer.h
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2010-06-22 16:36:42 +0200
committerAlexander Larsson <alexl@redhat.com>2010-06-22 17:34:45 +0200
commit72cf104c2897b4dd124c8a65df02e6895a9f1d88 (patch)
treea1f4c3db6621d16db6744fc84ee0a22736e5108b /client/red_peer.h
parent652c13e71b8c203fc701edb6bad365c50e7cf1aa (diff)
downloadspice-72cf104c2897b4dd124c8a65df02e6895a9f1d88.tar.gz
spice-72cf104c2897b4dd124c8a65df02e6895a9f1d88.tar.xz
spice-72cf104c2897b4dd124c8a65df02e6895a9f1d88.zip
client: Support connecting to a major==1 server
Diffstat (limited to 'client/red_peer.h')
-rw-r--r--client/red_peer.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/client/red_peer.h b/client/red_peer.h
index 001f9fa9..25a35605 100644
--- a/client/red_peer.h
+++ b/client/red_peer.h
@@ -73,11 +73,13 @@ public:
};
ConnectionOptions(Type in_type, int in_port, int in_sport,
+ int in_protocol,
const HostAuthOptions& in_host_auth,
const std::string& in_ciphers)
: type (in_type)
, unsecure_port (in_port)
, secure_port (in_sport)
+ , protocol (in_protocol)
, host_auth (in_host_auth)
, ciphers (in_ciphers)
{
@@ -99,6 +101,7 @@ public:
Type type;
int unsecure_port;
int secure_port;
+ int protocol; // 0 == auto
HostAuthOptions host_auth; // for secure connection
std::string ciphers;
};
@@ -130,10 +133,10 @@ protected:
static bool verify_subject(X509* cert, const HostAuthOptions::CertFieldValueList& subject);
static int ssl_verify_callback(int preverify_ok, X509_STORE_CTX *ctx);
+ void cleanup();
private:
void shutdown();
- void cleanup();
private:
SOCKET _peer;