Message ID | 20201224093858.1455190-2-mark.d.gray@redhat.com |
---|---|
State | Changes Requested |
Headers | show
Return-Path: <ovs-dev-bounces@openvswitch.org> 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.133; helo=hemlock.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Z0LOBTgc; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4D1lQS4wVSz9sTX for <incoming@patchwork.ozlabs.org>; Thu, 24 Dec 2020 20:39:12 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id DB177871D6; Thu, 24 Dec 2020 09:39:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kw3GJzRkv0Km; Thu, 24 Dec 2020 09:39:10 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by hemlock.osuosl.org (Postfix) with ESMTP id 4802987398; Thu, 24 Dec 2020 09:39:10 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 36C6EC1787; Thu, 24 Dec 2020 09:39:10 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id C318AC1787 for <dev@openvswitch.org>; Thu, 24 Dec 2020 09:39:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A4F6C866CE for <dev@openvswitch.org>; Thu, 24 Dec 2020 09:39:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JYPSfxjyU55a for <dev@openvswitch.org>; Thu, 24 Dec 2020 09:39:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by whitealder.osuosl.org (Postfix) with ESMTPS id A6D0186679 for <dev@openvswitch.org>; Thu, 24 Dec 2020 09:39:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608802745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yZaTZFDPoUaDH77orQw7Wvlb+/pNkVUsg9GaFF63YuY=; b=Z0LOBTgc/Ljs33Py8+duwwOm6Z/FZ5uy4uu3R8w2XOpRMg2xLDAt8imoQTA+6T9V78YKRP zNkfbQbY2VM7jASfk/V9W51P+iMJ37JIeIo0RWC04nVwuvBrrfC+p9xXzcTAS3DbUgLz6W s9jNPKrrqJzhZWPaZ6X9U46Q91jP7V0= Received: from mail-il1-f199.google.com (mail-il1-f199.google.com [209.85.166.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-185-JszbgB2yPeKkRofq8HI0Hg-1; Thu, 24 Dec 2020 04:39:03 -0500 X-MC-Unique: JszbgB2yPeKkRofq8HI0Hg-1 Received: by mail-il1-f199.google.com with SMTP id p6so1395135ilb.2 for <dev@openvswitch.org>; Thu, 24 Dec 2020 01:39:03 -0800 (PST) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=yZaTZFDPoUaDH77orQw7Wvlb+/pNkVUsg9GaFF63YuY=; b=dMqB/jsR6PIO9aTDVNXnJ5BMo7oquzQlvW9t+UnE3S11fQmkc5XKAsdpf4pYIUYmxR q43o4uBs4R79ukgFyzlQIFfI3dDaIyKCIJ+IP1QFIYu91wbQDbhAVfTt45FE2sxZ84fO OztzGKP+S31SlF2Cj6CcBpJzeblWZ2nYFXnAgmNa98RLLznSfiS3D4irjSKbEoDt1yKu 0dUr4oPusah1aGFsPWu6xavThIbKxLhb7vQ/AQVBd2knHwDoEJluNqaExz5nyCzZMin7 tbWufIvorT5WqOc+4BT3K3yR3xfEu1J4AxxzPoL/zKZugkOUT5hInj5VFfGsEVE6j7ni Hebw== X-Gm-Message-State: AOAM532bh/5MPfd3/PYVxv63PP0wz4pFsHCJEN3TkutF1FTCjbDXeNjR tEc2OncV5ZsjQIOSLTjOh9thGWZLs2vkYL4QlYnntTuAgmmZsg7hol5iFNNkXTHefnhqweVnDQb VgW8DvufWegitL0XaBMTGXd4Y6SuFMJp85UWqxWg0xTJMntCdjzGriOBLECC6F40Kxezj X-Received: by 2002:a05:6e02:b2f:: with SMTP id e15mr28357573ilu.37.1608802742352; Thu, 24 Dec 2020 01:39:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJyAdI6zii71N70JMnIKhl5kmllc4Tja1Cbc8wmbD2ALKspA5VyI0nQPChl574v9zQbrU4g2Jw== X-Received: by 2002:a05:6e02:b2f:: with SMTP id e15mr28357567ilu.37.1608802742178; Thu, 24 Dec 2020 01:39:02 -0800 (PST) Received: from wsfd-netdev77.ntdv.lab.eng.bos.redhat.com (nat-pool-bos-t.redhat.com. [66.187.233.206]) by smtp.gmail.com with ESMTPSA id i6sm18189310ilm.70.2020.12.24.01.39.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Dec 2020 01:39:01 -0800 (PST) From: Mark Gray <mark.d.gray@redhat.com> To: dev@openvswitch.org, mark.d.gray@redhat.com Date: Thu, 24 Dec 2020 04:38:55 -0500 Message-Id: <20201224093858.1455190-2-mark.d.gray@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201224093858.1455190-1-mark.d.gray@redhat.com> References: <20201224093858.1455190-1-mark.d.gray@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mark.d.gray@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: Flavio Leitner <fbl@sysclose.org> Subject: [ovs-dev] [PATCH v2 1/4] ovs-monitor-ipsec: Fix active connection regex X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: <ovs-dev.openvswitch.org> List-Unsubscribe: <https://mail.openvswitch.org/mailman/options/ovs-dev>, <mailto:ovs-dev-request@openvswitch.org?subject=unsubscribe> List-Archive: <http://mail.openvswitch.org/pipermail/ovs-dev/> List-Post: <mailto:ovs-dev@openvswitch.org> List-Help: <mailto:ovs-dev-request@openvswitch.org?subject=help> List-Subscribe: <https://mail.openvswitch.org/mailman/listinfo/ovs-dev>, <mailto:ovs-dev-request@openvswitch.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" <ovs-dev-bounces@openvswitch.org> |
Series |
ipsec: Various fixes for ovs-monitor-ipsec
|
expand
|
diff --git a/ipsec/ovs-monitor-ipsec.in b/ipsec/ovs-monitor-ipsec.in index b84608a55d8a..1793088d9be1 100755 --- a/ipsec/ovs-monitor-ipsec.in +++ b/ipsec/ovs-monitor-ipsec.in @@ -625,7 +625,10 @@ conn prevent_unencrypted_vxlan continue conn = m.group(1) - m = re.match(r"(.*)(-in-\d+|-out-\d+|-\d+)", conn) + m = re.match(r"(.*)(-in-\d+|-out-\d+)", conn) + if not m: + # GRE connections have format <iface>-<ver> + m = re.match(r"(.*)(-\d+)", conn) if not m: continue