diff --git a/hmp-commands.hx b/hmp-commands.hx

index XXXXXXX..XXXXXXX 100644

--- a/hmp-commands.hx

+++ b/hmp-commands.hx

@@ -XXX,XX +XXX,XX @@ ETEXI

{

.name = "hostfwd_add",

.args_type = "arg1:s,arg2:s?,arg3:s?",

- .params = "[vlan_id name] [tcp|udp]:[hostaddr]:hostport-[guestaddr]:guestport",

+ .params = "[hub_id name]|[netdev_id] [tcp|udp]:[hostaddr]:hostport-[guestaddr]:guestport",

.help = "redirect TCP or UDP connections from host to guest (requires -net user)",

.cmd = hmp_hostfwd_add,

},

@@ -XXX,XX +XXX,XX @@ ETEXI

{

.name = "hostfwd_remove",

.args_type = "arg1:s,arg2:s?,arg3:s?",

- .params = "[vlan_id name] [tcp|udp]:[hostaddr]:hostport",

+ .params = "[hub_id name]|[netdev_id] [tcp|udp]:[hostaddr]:hostport",

.help = "remove host-to-guest TCP or UDP redirection",

.cmd = hmp_hostfwd_remove,

},

- packet_destroy(pkt, NULL);

* If one packet arrive late, the secondary_list or

@@ -XXX,XX +XXX,XX @@ static void colo_compare_connection(void *opaque, void *user_data)

}

}

+/*

+ * Called from the compare thread on the primary

+ * for compare packet with secondary list of the

+ * specified connection when a new packet was

+ * queued to it.

+ */

+static void colo_compare_connection(void *opaque, void *user_data)

+{

+ CompareState *s = user_data;

+ Connection *conn = opaque;

+

+ switch (conn->ip_proto) {

+ case IPPROTO_TCP:

+ colo_compare_tcp(s, conn);

+ break;

+ case IPPROTO_UDP:

+ colo_compare_packet(s, conn, colo_packet_compare_udp);

+ break;

+ case IPPROTO_ICMP:

+ colo_compare_packet(s, conn, colo_packet_compare_icmp);

+ break;

+ default:

+ colo_compare_packet(s, conn, colo_packet_compare_other);

+ break;

+ }

+}

+

static int compare_chr_send(CompareState *s,

const uint8_t *buf,

uint32_t size,

diff --git a/net/colo.c b/net/colo.c

index XXXXXXX..XXXXXXX 100644

--- a/net/colo.c

+++ b/net/colo.c

@@ -XXX,XX +XXX,XX @@ Connection *connection_new(ConnectionKey *key)

conn->processing = false;

conn->offset = 0;

conn->syn_flag = 0;

+ conn->pack = 0;

+ conn->sack = 0;

g_queue_init(&conn->primary_list);

g_queue_init(&conn->secondary_list);

@@ -XXX,XX +XXX,XX @@ Packet *packet_new(const void *data, int size, int vnet_hdr_len)

pkt->size = size;

pkt->creation_ms = qemu_clock_get_ms(QEMU_CLOCK_HOST);

pkt->vnet_hdr_len = vnet_hdr_len;

+ pkt->tcp_seq = 0;

+ pkt->tcp_ack = 0;

+ pkt->seq_end = 0;

+ pkt->header_size = 0;

+ pkt->payload_size = 0;

+ pkt->offset = 0;

+ pkt->flags = 0;

return pkt;

}

diff --git a/net/colo.h b/net/colo.h

index XXXXXXX..XXXXXXX 100644

--- a/net/colo.h

+++ b/net/colo.h

@@ -XXX,XX +XXX,XX @@ typedef struct Packet {

int64_t creation_ms;

/* Get vnet_hdr_len from filter */

uint32_t vnet_hdr_len;

+ uint32_t tcp_seq; /* sequence number */

+ uint32_t tcp_ack; /* acknowledgement number */

+ /* the sequence number of the last byte of the packet */

+ uint32_t seq_end;

+ uint8_t header_size; /* the header length */

+ uint16_t payload_size; /* the payload length */

+ /* record the payload offset(the length that has been compared) */

+ uint16_t offset;

+ uint8_t flags; /* Flags(aka Control bits) */

} Packet;

typedef struct ConnectionKey {

@@ -XXX,XX +XXX,XX @@ typedef struct Connection {

/* flag to enqueue unprocessed_connections */

bool processing;

uint8_t ip_proto;

+ /* record the sequence number that has been compared */

+ uint32_t compare_seq;

+ /* the maximum of acknowledgement number in primary_list queue */

+ uint32_t pack;

+ /* the maximum of acknowledgement number in secondary_list queue */

+ uint32_t sack;

/* offset = secondary_seq - primary_seq */

tcp_seq offset;

/*

diff --git a/net/trace-events b/net/trace-events

index XXXXXXX..XXXXXXX 100644

--- a/net/trace-events

+++ b/net/trace-events

@@ -XXX,XX +XXX,XX @@ colo_compare_icmp_miscompare(const char *sta, int size) ": %s = %d"

colo_compare_ip_info(int psize, const char *sta, const char *stb, int ssize, const char *stc, const char *std) "ppkt size = %d, ip_src = %s, ip_dst = %s, spkt size = %d, ip_src = %s, ip_dst = %s"

colo_old_packet_check_found(int64_t old_time) "%" PRId64

colo_compare_miscompare(void) ""

-colo_compare_tcp_info(const char *pkt, uint32_t seq, uint32_t ack, int res, uint32_t flag, int size) "side: %s seq/ack= %u/%u res= %d flags= 0x%x pkt_size: %d\n"

+colo_compare_tcp_info(const char *pkt, uint32_t seq, uint32_t ack, int hdlen, int pdlen, int offset, int flags) "%s: seq/ack= %u/%u hdlen= %d pdlen= %d offset= %d flags=%d\n"

# net/filter-rewriter.c

colo_filter_rewriter_debug(void) ""