From patchwork Mon Apr 27 15:42:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 1277754 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=VsRqLnto; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 499pvR74PYz9sRf for ; Tue, 28 Apr 2020 01:42:59 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7F27285FBA; Mon, 27 Apr 2020 15:42:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 03i98s6nimXF; Mon, 27 Apr 2020 15:42:58 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by fraxinus.osuosl.org (Postfix) with ESMTP id 037EA8458C; Mon, 27 Apr 2020 15:42:58 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id DF22DC18DC; Mon, 27 Apr 2020 15:42:57 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id F1E29C0172 for ; Mon, 27 Apr 2020 15:42:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E15D68458C for ; Mon, 27 Apr 2020 15:42:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wi_ZnNgW3uTd for ; Mon, 27 Apr 2020 15:42:55 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 7169F844AB for ; Mon, 27 Apr 2020 15:42:55 +0000 (UTC) Received: by mail-pf1-f194.google.com with SMTP id z1so7496184pfn.3 for ; Mon, 27 Apr 2020 08:42:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=HDFZ03ENDTaqdW5zsjAqloDzeJTwK2FeZl6DPy5Yvys=; b=VsRqLntoBz79k7jqAC7YQV9f/1u3tqSz1jq5KYM7NZCbZNe+hSQDHxDEaz9M4vrbld Mc/bk0JDAilZimxY+p4Vz6JAoFcUJJIw2sYB4UGwmoDQrOFF1VhM1N3Kcfi4SWlX33iO 7/4NOeQ8S4Hp/b8g6DCBMCud+feUQlyWkET1IyfWqIrWJtdUUIEyoEora4T5atyl4X5L uVfxPPs8Q8fVleFL3zEpZiivF0kArcMOmg/nrZEHBuHXKYpNqRW2IzzdvIqPNBE8mexe 8eTnXUbgLxttU7nwYnoj4LUJP/vej9GVt4gcQhridIaf9t1h8tfu4WevsZ3hYicto1nr MBnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=HDFZ03ENDTaqdW5zsjAqloDzeJTwK2FeZl6DPy5Yvys=; b=dJIBq8OBclOvfvKtoL82jXQZxb401ApTiKylGJMALNMut3Ve89LkBS+ejqX+st/5WY Y/+AiNUSUbCYz9XJqS0H/zAfhBkepj7IPhEyyXVxxo/hBAoLS/s24yqRQadW51HA1Q/3 p4ZKk7ktboXMWZxdKQW100ahqmOE4c0TlvhaF2YQO5hoAFgpu5JPKSDjsAv17sB3mIfW DdlmyRVxe6aQtU7R1m2rmMLPaV6MnWPhk2Nn1nA9FnHpXpf61qcimb6mdv8nbh2brSlB /zjc4qcrdhaNvdZgB6auFXX+LK84rA27wRhFN+G+orRUns+5kUxBd/AbFklbptT4lZXv gm3A== X-Gm-Message-State: AGi0PuYjR+IQXDqwwSQCQxH6c21uF1n1VILTnaYsRpe7rpwkReKEdU5J /Bz9Xkcg/4s9QGn9TxHtLhdN7LKn X-Google-Smtp-Source: APiQypIJgCeQ5eNRNVNlENsmRwcsQuG5tKw5MZ0GMKt3Paabvc58HSi6oNTuCSMfRQuYSZym9Qx3bw== X-Received: by 2002:a63:1759:: with SMTP id 25mr24108293pgx.417.1588002174769; Mon, 27 Apr 2020 08:42:54 -0700 (PDT) Received: from sc9-mailhost3.vmware.com (c-76-21-95-192.hsd1.ca.comcast.net. [76.21.95.192]) by smtp.gmail.com with ESMTPSA id f2sm11397998pju.32.2020.04.27.08.42.54 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Apr 2020 08:42:54 -0700 (PDT) From: William Tu To: dev@openvswitch.org Date: Mon, 27 Apr 2020 08:42:29 -0700 Message-Id: <1588002150-9823-1-git-send-email-u9012063@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [ovs-dev] [PATCHv4 1/2] conntrack: Fix icmp conntrack state. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" ICMP conntrack state should be ICMPS_REPLY after seeing both side of ICMP traffic. Signed-off-by: William Tu Acked-by: Yi-Hung Wei --- lib/conntrack-icmp.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/conntrack-icmp.c b/lib/conntrack-icmp.c index 63246f0124d0..6cbf9656dd93 100644 --- a/lib/conntrack-icmp.c +++ b/lib/conntrack-icmp.c @@ -50,9 +50,12 @@ icmp_conn_update(struct conntrack *ct, struct conn *conn_, struct dp_packet *pkt OVS_UNUSED, bool reply, long long now) { struct conn_icmp *conn = conn_icmp_cast(conn_); - conn->state = reply ? ICMPS_REPLY : ICMPS_FIRST; - conn_update_expiration(ct, &conn->up, icmp_timeouts[conn->state], now); + if (reply && conn->state == ICMPS_FIRST) { + conn->state = ICMPS_REPLY; + } + + conn_update_expiration(ct, &conn->up, icmp_timeouts[conn->state], now); return CT_UPDATE_VALID; }