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 /server/main_channel.c | |
| parent | 70f820ded2817b754947631e542e648e3f7d1d23 (diff) | |
| download | spice-35cf65a45e5327966d19cd5db0cb2c91bb828abe.tar.gz spice-35cf65a45e5327966d19cd5db0cb2c91bb828abe.tar.xz spice-35cf65a45e5327966d19cd5db0cb2c91bb828abe.zip | |
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.
Diffstat (limited to 'server/main_channel.c')
| -rw-r--r-- | server/main_channel.c | 16 |
1 files changed, 8 insertions, 8 deletions
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); } |