[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V7 10/12] net/colo-compare.c: Add vnet packet's tcp/
From: |
Zhang Chen |
Subject: |
[Qemu-devel] [PATCH V7 10/12] net/colo-compare.c: Add vnet packet's tcp/udp/icmp compare |
Date: |
Tue, 4 Jul 2017 14:53:54 +0800 |
COLO-Proxy just focus on packet payload, so we skip vnet header.
Signed-off-by: Zhang Chen <address@hidden>
---
net/colo-compare.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/net/colo-compare.c b/net/colo-compare.c
index 945e7d4..0be12de 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -201,8 +201,11 @@ static int colo_packet_compare_common(Packet *ppkt, Packet
*spkt, int offset)
sec_ip_src, sec_ip_dst);
}
+ offset = ppkt->vnet_hdr_len + offset;
+
if (ppkt->size == spkt->size) {
- return memcmp(ppkt->data + offset, spkt->data + offset,
+ return memcmp(ppkt->data + offset,
+ spkt->data + offset,
spkt->size - offset);
} else {
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) {
ptrdiff_t tcp_offset;
+
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);
} else if (ptcp->th_sum == stcp->th_sum) {
res = colo_packet_compare_common(ppkt, spkt, ETH_HLEN);
--
2.7.4
- [Qemu-devel] [PATCH V7 00/12] Add COLO-proxy virtio-net support, Zhang Chen, 2017/07/04
- [Qemu-devel] [PATCH V7 01/12] net: Add vnet_hdr_len arguments in NetClientState, Zhang Chen, 2017/07/04
- [Qemu-devel] [PATCH V7 06/12] net/colo.c: Make vnet_hdr_len as packet property, Zhang Chen, 2017/07/04
- [Qemu-devel] [PATCH V7 05/12] net/filter-mirror.c: Add new option to enable vnet support for filter-redirector, Zhang Chen, 2017/07/04
- [Qemu-devel] [PATCH V7 09/12] net/colo.c: Add vnet packet parse feature in colo-proxy, Zhang Chen, 2017/07/04
- [Qemu-devel] [PATCH V7 12/12] docs/colo-proxy.txt: Update colo-proxy usage of net driver with vnet_header, Zhang Chen, 2017/07/04
- [Qemu-devel] [PATCH V7 10/12] net/colo-compare.c: Add vnet packet's tcp/udp/icmp compare,
Zhang Chen <=
- [Qemu-devel] [PATCH V7 03/12] net/filter-mirror.c: Introduce parameter for filter_send(), Zhang Chen, 2017/07/04
- [Qemu-devel] [PATCH V7 04/12] net/filter-mirror.c: Make filter mirror support vnet support., Zhang Chen, 2017/07/04
- [Qemu-devel] [PATCH V7 02/12] net/net.c: Add vnet_hdr support in SocketReadState, Zhang Chen, 2017/07/04
- [Qemu-devel] [PATCH V7 07/12] net/colo-compare.c: Introduce parameter for compare_chr_send(), Zhang Chen, 2017/07/04
- [Qemu-devel] [PATCH V7 08/12] net/colo-compare.c: Make colo-compare support vnet_hdr_len, Zhang Chen, 2017/07/04
- [Qemu-devel] [PATCH V7 11/12] net/filter-rewriter.c: Make filter-rewriter support vnet_hdr_len, Zhang Chen, 2017/07/04
- Re: [Qemu-devel] [PATCH V7 00/12] Add COLO-proxy virtio-net support, Jason Wang, 2017/07/13