Also Update server and client according to the change of
SpiceMsgMainMigrationBegin: it now holds all the fields inside
SpiceMigrationDstInfo.
---
client/red_client.cpp | 18 +++++++++---------
server/main_channel.c | 16 ++++++++--------
spice-common | 2 +-
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/client/red_client.cpp b/client/red_client.cpp
index 8f86d3e..6a71291 100644
--- a/client/red_client.cpp
+++ b/client/red_client.cpp
@@ -291,20 +291,20 @@ void Migrate::start(const SpiceMsgMainMigrationBegin* migrate)
_sport = old_migrate->sport ? old_migrate->sport : -1;;
_auth_options = _client.get_host_auth_options();
} else {
- _host.assign((char *)migrate->host_data);
- _port = migrate->port ? migrate->port : -1;
- _sport = migrate->sport ? migrate->sport : -1;
+ _host.assign((char *)migrate->dst_info.host_data);
+ _port = migrate->dst_info.port ? migrate->dst_info.port : -1;
+ _sport = migrate->dst_info.sport ? migrate->dst_info.sport : -1;
if ((peer_major == 1) || (peer_major == 2 && peer_minor < 1)) {
_auth_options.type_flags = SPICE_SSL_VERIFY_OP_PUBKEY;
- _auth_options.host_pubkey.assign(migrate->pub_key_data, migrate->pub_key_data +
- migrate->pub_key_size);
+ _auth_options.host_pubkey.assign(migrate->dst_info.pub_key_data, migrate->dst_info.pub_key_data +
+ migrate->dst_info.pub_key_size);
} else {
_auth_options.type_flags = SPICE_SSL_VERIFY_OP_SUBJECT;
_auth_options.CA_file = _client.get_host_auth_options().CA_file;
- if (migrate->cert_subject_size != 0) {
- _auth_options.host_subject.assign(migrate->cert_subject_data,
- migrate->cert_subject_data +
- migrate->cert_subject_size);
+ if (migrate->dst_info.cert_subject_size != 0) {
+ _auth_options.host_subject.assign(migrate->dst_info.cert_subject_data,
+ migrate->dst_info.cert_subject_data +
+ migrate->dst_info.cert_subject_size);
}
}
}
diff --git a/server/main_channel.c b/server/main_channel.c
index 0d948de..25eaf18 100644
--- a/server/main_channel.c
+++ b/server/main_channel.c
@@ -582,16 +582,16 @@ static void main_channel_marshall_migrate_begin(SpiceMarshaller *m, RedChannelCl
MainChannel *main_ch;
main_ch = SPICE_CONTAINEROF(rcc->channel, MainChannel, base);
- migrate.port = main_ch->mig_target.port;
- migrate.sport = main_ch->mig_target.sport;
- migrate.host_size = strlen(main_ch->mig_target.host) + 1;
- migrate.host_data = (uint8_t *)main_ch->mig_target.host;
+ migrate.dst_info.port = main_ch->mig_target.port;
+ migrate.dst_info.sport = main_ch->mig_target.sport;
+ migrate.dst_info.host_size = strlen(main_ch->mig_target.host) + 1;
+ migrate.dst_info.host_data = (uint8_t *)main_ch->mig_target.host;
if (main_ch->mig_target.cert_subject) {
- migrate.cert_subject_size = strlen(main_ch->mig_target.cert_subject) + 1;
- migrate.cert_subject_data = (uint8_t *)main_ch->mig_target.cert_subject;
+ migrate.dst_info.cert_subject_size = strlen(main_ch->mig_target.cert_subject) + 1;
+ migrate.dst_info.cert_subject_data = (uint8_t *)main_ch->mig_target.cert_subject;
} else {
- migrate.cert_subject_size = 0;
- migrate.cert_subject_data = NULL;
+ migrate.dst_info.cert_subject_size = 0;
+ migrate.dst_info.cert_subject_data = NULL;
}
spice_marshall_msg_main_migrate_begin(m, &migrate);
}
diff --git a/spice-common b/spice-common
index 7439137..692f77d 160000
--- a/spice-common
+++ b/spice-common
@@ -1 +1 @@
-Subproject commit 7439137509f838f95d672454cb9c30def7f84f89
+Subproject commit 692f77d1cf2428442e724a19a1a204bf3c32be97
--
1.7.7.6
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/spice-devel