[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/14] net/colo-compare.c: Add vnet packet's tcp/udp/
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 10/14] net/colo-compare.c: Add vnet packet's tcp/udp/icmp compare |
Date: |
Mon, 17 Jul 2017 20:21:41 +0800 |
From: Zhang Chen <address@hidden>
COLO-Proxy just focus on packet payload, so we skip vnet header.
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Jason Wang <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 95911a2..ca67c68 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] [PULL 00/14] Net patches, Jason Wang, 2017/07/17
- [Qemu-devel] [PULL 01/14] net: Add vnet_hdr_len arguments in NetClientState, Jason Wang, 2017/07/17
- [Qemu-devel] [PULL 02/14] net/net.c: Add vnet_hdr support in SocketReadState, Jason Wang, 2017/07/17
- [Qemu-devel] [PULL 03/14] net/filter-mirror.c: Introduce parameter for filter_send(), Jason Wang, 2017/07/17
- [Qemu-devel] [PULL 04/14] net/filter-mirror.c: Make filter mirror support vnet support., Jason Wang, 2017/07/17
- [Qemu-devel] [PULL 05/14] net/filter-mirror.c: Add new option to enable vnet support for filter-redirector, Jason Wang, 2017/07/17
- [Qemu-devel] [PULL 06/14] net/colo.c: Make vnet_hdr_len as packet property, Jason Wang, 2017/07/17
- [Qemu-devel] [PULL 07/14] net/colo-compare.c: Introduce parameter for compare_chr_send(), Jason Wang, 2017/07/17
- [Qemu-devel] [PULL 08/14] net/colo-compare.c: Make colo-compare support vnet_hdr_len, Jason Wang, 2017/07/17
- [Qemu-devel] [PULL 09/14] net/colo.c: Add vnet packet parse feature in colo-proxy, Jason Wang, 2017/07/17
- [Qemu-devel] [PULL 10/14] net/colo-compare.c: Add vnet packet's tcp/udp/icmp compare,
Jason Wang <=
- [Qemu-devel] [PULL 11/14] net/filter-rewriter.c: Make filter-rewriter support vnet_hdr_len, Jason Wang, 2017/07/17
- [Qemu-devel] [PULL 12/14] docs/colo-proxy.txt: Update colo-proxy usage of net driver with vnet_header, Jason Wang, 2017/07/17
- [Qemu-devel] [PULL 13/14] virtion-net: Prefer is_power_of_2(), Jason Wang, 2017/07/17
- [Qemu-devel] [PULL 14/14] virtio-net: fix offload ctrl endian, Jason Wang, 2017/07/17
- Re: [Qemu-devel] [PULL 00/14] Net patches, Peter Maydell, 2017/07/18