Move RedsMigSpice to main-channel.h

This is the place that needs the complete type definition. If it is
defined in reds.h, it can create circular references.
This commit is contained in:
Jonathon Jongsma 2015-07-31 17:31:58 +01:00 committed by Christophe Fergeau
parent 0eaf34c04b
commit ff97799487
2 changed files with 8 additions and 8 deletions

View File

@ -21,7 +21,6 @@
#include <stdint.h>
#include <spice/vd_agent.h>
#include "common/marshaller.h"
#include "reds.h"
#include "red_channel.h"
// TODO: Defines used to calculate receive buffer size, and also by reds.c
@ -33,6 +32,14 @@
#define MAIN_CHANNEL_RECEIVE_BUF_SIZE \
(4096 + (REDS_AGENT_WINDOW_SIZE + REDS_NUM_INTERNAL_AGENT_MESSAGES) * SPICE_AGENT_MAX_DATA_SIZE)
struct RedsMigSpice {
char *host;
char *cert_subject;
int port;
int sport;
};
typedef struct RedsMigSpice RedsMigSpice;
typedef struct MainChannel {
RedChannel base;
uint8_t recv_buf[MAIN_CHANNEL_RECEIVE_BUF_SIZE];

View File

@ -44,13 +44,6 @@ struct SpiceMigrateState {
int dummy;
};
typedef struct RedsMigSpice {
char *host;
char *cert_subject;
int port;
int sport;
} RedsMigSpice;
/* main thread only */
void reds_handle_channel_event(int event, SpiceChannelEventInfo *info);