diff options
| author | Yonit Halperin <yhalperi@redhat.com> | 2012-08-02 09:54:46 +0300 |
|---|---|---|
| committer | Yonit Halperin <yhalperi@redhat.com> | 2012-08-27 09:10:53 +0300 |
| commit | 35cf65a45e5327966d19cd5db0cb2c91bb828abe (patch) | |
| tree | 1d723b98396a9b5998d7931f721a4bc73ab1dd9a | |
| parent | 70f820ded2817b754947631e542e648e3f7d1d23 (diff) | |
seamless-migration: update spice-common submodule
Also Update server and client according to the change of
SpiceMsgMainMigrationBegin: it now holds all the fields inside
SpiceMigrationDstInfo.
| -rw-r--r-- | client/red_client.cpp | 18 | ||||
| -rw-r--r-- | server/main_channel.c | 16 | ||||
| m--------- | spice-common | 0 |
3 files changed, 17 insertions, 17 deletions
diff --git a/client/red_client.cpp b/client/red_client.cpp index 8f86d3ef..6a712919 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 0d948dec..25eaf186 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 -Subproject c6bd210ad0b6eb485fda25426ab9d75253439f5 +Subproject c2f58492ad2df22c4eb4e6c04750010113dce56 |