net/colo.c: Make vnet_hdr_len as packet property
We can use this property flush and send packet with vnet_hdr_len. Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
parent
00d5c2406b
commit
ada1a33f9a
@ -121,9 +121,13 @@ static int packet_enqueue(CompareState *s, int mode)
|
|||||||
Connection *conn;
|
Connection *conn;
|
||||||
|
|
||||||
if (mode == PRIMARY_IN) {
|
if (mode == PRIMARY_IN) {
|
||||||
pkt = packet_new(s->pri_rs.buf, s->pri_rs.packet_len);
|
pkt = packet_new(s->pri_rs.buf,
|
||||||
|
s->pri_rs.packet_len,
|
||||||
|
s->pri_rs.vnet_hdr_len);
|
||||||
} else {
|
} else {
|
||||||
pkt = packet_new(s->sec_rs.buf, s->sec_rs.packet_len);
|
pkt = packet_new(s->sec_rs.buf,
|
||||||
|
s->sec_rs.packet_len,
|
||||||
|
s->sec_rs.vnet_hdr_len);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (parse_packet_early(pkt)) {
|
if (parse_packet_early(pkt)) {
|
||||||
|
@ -153,13 +153,14 @@ void connection_destroy(void *opaque)
|
|||||||
g_slice_free(Connection, conn);
|
g_slice_free(Connection, conn);
|
||||||
}
|
}
|
||||||
|
|
||||||
Packet *packet_new(const void *data, int size)
|
Packet *packet_new(const void *data, int size, int vnet_hdr_len)
|
||||||
{
|
{
|
||||||
Packet *pkt = g_slice_new(Packet);
|
Packet *pkt = g_slice_new(Packet);
|
||||||
|
|
||||||
pkt->data = g_memdup(data, size);
|
pkt->data = g_memdup(data, size);
|
||||||
pkt->size = size;
|
pkt->size = size;
|
||||||
pkt->creation_ms = qemu_clock_get_ms(QEMU_CLOCK_HOST);
|
pkt->creation_ms = qemu_clock_get_ms(QEMU_CLOCK_HOST);
|
||||||
|
pkt->vnet_hdr_len = vnet_hdr_len;
|
||||||
|
|
||||||
return pkt;
|
return pkt;
|
||||||
}
|
}
|
||||||
|
@ -43,6 +43,8 @@ typedef struct Packet {
|
|||||||
int size;
|
int size;
|
||||||
/* Time of packet creation, in wall clock ms */
|
/* Time of packet creation, in wall clock ms */
|
||||||
int64_t creation_ms;
|
int64_t creation_ms;
|
||||||
|
/* Get vnet_hdr_len from filter */
|
||||||
|
uint32_t vnet_hdr_len;
|
||||||
} Packet;
|
} Packet;
|
||||||
|
|
||||||
typedef struct ConnectionKey {
|
typedef struct ConnectionKey {
|
||||||
@ -82,7 +84,7 @@ Connection *connection_get(GHashTable *connection_track_table,
|
|||||||
ConnectionKey *key,
|
ConnectionKey *key,
|
||||||
GQueue *conn_list);
|
GQueue *conn_list);
|
||||||
void connection_hashtable_reset(GHashTable *connection_track_table);
|
void connection_hashtable_reset(GHashTable *connection_track_table);
|
||||||
Packet *packet_new(const void *data, int size);
|
Packet *packet_new(const void *data, int size, int vnet_hdr_len);
|
||||||
void packet_destroy(void *opaque, void *user_data);
|
void packet_destroy(void *opaque, void *user_data);
|
||||||
|
|
||||||
#endif /* QEMU_COLO_PROXY_H */
|
#endif /* QEMU_COLO_PROXY_H */
|
||||||
|
@ -158,7 +158,7 @@ static ssize_t colo_rewriter_receive_iov(NetFilterState *nf,
|
|||||||
char *buf = g_malloc0(size);
|
char *buf = g_malloc0(size);
|
||||||
|
|
||||||
iov_to_buf(iov, iovcnt, 0, buf, size);
|
iov_to_buf(iov, iovcnt, 0, buf, size);
|
||||||
pkt = packet_new(buf, size);
|
pkt = packet_new(buf, size, 0);
|
||||||
g_free(buf);
|
g_free(buf);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Loading…
x
Reference in New Issue
Block a user