openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net/colo-compare.c: Add vnet packet's tcp/udp/icmp compare 

COLO-Proxy just focus on packet payload, so we skip vnet header.

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Zhang Chen 2017-07-04 14:53:54 +08:00 committed by Jason Wang
parent 5cc444d367
commit d63b366a26
1 changed files with 6 additions and 2 deletions

8
net/colo-compare.c
View File

@ -201,8 +201,11 @@ static int colo_packet_compare_common(Packet *ppkt, Packet *spkt, int offset)
sec_ip_src, sec_ip_dst); sec_ip_src, sec_ip_dst);
} }
offset = ppkt->vnet_hdr_len + offset;
if (ppkt->size == spkt->size) { if (ppkt->size == spkt->size) {
return memcmp(ppkt->data + offset, spkt->data + offset, return memcmp(ppkt->data + offset,
spkt->data + offset,
spkt->size - offset); spkt->size - offset);
} else { } else {
trace_colo_compare_main("Net packet size are not the same"); trace_colo_compare_main("Net packet size are not the same");
@ -261,8 +264,9 @@ static int colo_packet_compare_tcp(Packet *spkt, Packet *ppkt)
*/ */
if (ptcp->th_off > 5) { if (ptcp->th_off > 5) {
ptrdiff_t tcp_offset; ptrdiff_t tcp_offset;
tcp_offset = ppkt->transport_header - (uint8_t *)ppkt->data tcp_offset = ppkt->transport_header - (uint8_t *)ppkt->data
+ (ptcp->th_off * 4); + (ptcp->th_off * 4) - ppkt->vnet_hdr_len;
res = colo_packet_compare_common(ppkt, spkt, tcp_offset); res = colo_packet_compare_common(ppkt, spkt, tcp_offset);
} else if (ptcp->th_sum == stcp->th_sum) { } else if (ptcp->th_sum == stcp->th_sum) {
res = colo_packet_compare_common(ppkt, spkt, ETH_HLEN); res = colo_packet_compare_common(ppkt, spkt, ETH_HLEN);