From nobody Thu May 1 07:01:15 2025
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as
permitted sender) client-ip=208.118.235.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Authentication-Results: mx.zohomail.com;
spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted
sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by
mx.zohomail.com
with SMTPS id 1500294749326411.81116122835067;
Mon, 17 Jul 2017 05:32:29 -0700 (PDT)
Received: from localhost ([::1]:50088 helo=lists.gnu.org)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1dX5CN-0001F6-1g
for importer@patchew.org; Mon, 17 Jul 2017 08:32:27 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:48359)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <jasowang@redhat.com>) id 1dX52b-0000r3-It
for qemu-devel@nongnu.org; Mon, 17 Jul 2017 08:22:24 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <jasowang@redhat.com>) id 1dX52a-0008Et-Q9
for qemu-devel@nongnu.org; Mon, 17 Jul 2017 08:22:21 -0400
Received: from mx1.redhat.com ([209.132.183.28]:46288)
by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
(Exim 4.71) (envelope-from <jasowang@redhat.com>) id 1dX52a-0008Ec-Ja
for qemu-devel@nongnu.org; Mon, 17 Jul 2017 08:22:20 -0400
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com
[10.5.11.11])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mx1.redhat.com (Postfix) with ESMTPS id 8FA2780F6D;
Mon, 17 Jul 2017 12:22:19 +0000 (UTC)
Received: from jason-ThinkPad-T450s.redhat.com (ovpn-12-128.pek2.redhat.com
[10.72.12.128])
by smtp.corp.redhat.com (Postfix) with ESMTP id D3A5C600C2;
Mon, 17 Jul 2017 12:22:17 +0000 (UTC)
DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8FA2780F6D
Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com;
dmarc=none (p=none dis=none) header.from=redhat.com
Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com;
spf=pass smtp.mailfrom=jasowang@redhat.com
DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 8FA2780F6D
From: Jason Wang <jasowang@redhat.com>
To: peter.maydell@linaro.org,
qemu-devel@nongnu.org
Date: Mon, 17 Jul 2017 20:21:41 +0800
Message-Id: <1500294105-13713-11-git-send-email-jasowang@redhat.com>
In-Reply-To: <1500294105-13713-1-git-send-email-jasowang@redhat.com>
References: <1500294105-13713-1-git-send-email-jasowang@redhat.com>
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16
(mx1.redhat.com [10.5.110.27]);
Mon, 17 Jul 2017 12:22:19 +0000 (UTC)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
[fuzzy]
X-Received-From: 209.132.183.28
Subject: [Qemu-devel] [PULL 10/14] net/colo-compare.c: Add vnet packet's
tcp/udp/icmp compare
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Cc: Jason Wang <jasowang@redhat.com>,
Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail: RSF_0 Z_629925259 SPT_0
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
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>
---
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, Pa=
cket *spkt, int offset)
sec_ip_src, sec_ip_dst);
}
=20
+ offset =3D ppkt->vnet_hdr_len + offset;
+
if (ppkt->size =3D=3D 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 =3D ppkt->transport_header - (uint8_t *)ppkt->data
- + (ptcp->th_off * 4);
+ + (ptcp->th_off * 4) - ppkt->vnet_hdr_len;
res =3D colo_packet_compare_common(ppkt, spkt, tcp_offset);
} else if (ptcp->th_sum =3D=3D stcp->th_sum) {
res =3D colo_packet_compare_common(ppkt, spkt, ETH_HLEN);
--=20
2.7.4