pxcloud/spice
6
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-08-09 14:19:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

seamless-migration: update spice-common submodule

Browse Source 
Also Update server and client according to the change of
SpiceMsgMainMigrationBegin: it now holds all the fields inside
SpiceMigrationDstInfo.
This commit is contained in:
Yonit Halperin 2012-08-02 09:54:46 +03:00
parent 70f820ded2
commit 35cf65a45e
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
client/red_client.cpp
View File

@ -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);
}
}
}

16
server/main_channel.c
View File

@ -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);
}

2
spice-common

@ -1 +1 @@
Subproject commit c6bd210ad0b6eb485fda25426ab9d75253439f54
Subproject commit c2f58492ad2df22c4eb4e6c04750010113dce567