Message ID | 20211123020452.25669-1-luizluca@gmail.com |
---|---|
State | Accepted |
Headers | show
Return-Path: <openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=YpgRSZG8; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=eNZVxTMQ; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=<UNKNOWN>) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HynbG3wTyz9sXN for <incoming@patchwork.ozlabs.org>; Tue, 23 Nov 2021 13:07:38 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=6vyqru9IWMZ3qUH3DpkZjb4J1gOz/9FRUDzrr86E3/Q=; b=YpgRSZG8f/EFjb sL+N/ktUCbk/Y7fHNGBl5awUwffag7EEkliIzBO0n9v+eL0t+vRNFNZfv9JkIi6bv15NHbyz32GZp BKRgGT6RMIuN/dHPmifcicUxPyIRAuMimo7PtJfcv0lEJsWDoeRMn8lHJd+Bt+nKNH4Sn/9dZI/bQ o1Zg4U+NTnoa9GNaz+sv+6rSfXCTqBzD65qB6gazyYDJhjLamP0AS17umKsGMca65zuVGNz0tHLfC z+tQKE1GTZFMVIRXAciA9HgIwhzxEcQLz30KxfPXSIf2KrPN6osi0CPfJDz3dcfAV3rLDOE1EJ0ZY NXijyJ/UJZuITMd6Nv7g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mpLBI-000cyJ-5E; Tue, 23 Nov 2021 02:05:12 +0000 Received: from mail-ua1-x932.google.com ([2607:f8b0:4864:20::932]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mpLB6-000cs3-BQ for openwrt-devel@lists.openwrt.org; Tue, 23 Nov 2021 02:05:01 +0000 Received: by mail-ua1-x932.google.com with SMTP id i6so40540727uae.6 for <openwrt-devel@lists.openwrt.org>; Mon, 22 Nov 2021 18:04:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Pc51OgigzOr/DX624fONX0rzoAxoHt7fYcjPx4Yymv8=; b=eNZVxTMQqbI/zU9czIF1jg2Y2D7e5JN8II6CXJ7oHIPfVDqKxBl4CQvCHophb3K2rq G5qbLp++b0qMVdVOIrPORdFMQnb19h0M9IjC6XIOyfQYSInJmsTWpSpW9d0a8gIbETQX gry4N7ONgXdf+nFj1bGS2QNtAJCuM8uaZK9lih0LkNwSVbRr3OPe545fu5HAts30nSfR JI2/oiGFQoXgJxiBT0VuJn50Be8+adic8GEZrojNDEIK9ZGgnj+/fXK0bTOxMBZoXZEc +/iLK89fw0W194mxHNaqFdc6BFiF4gJM6yq06k89HN2Z21Xc4Es2AIm2NOuqHniizdCO XGkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Pc51OgigzOr/DX624fONX0rzoAxoHt7fYcjPx4Yymv8=; b=q6HIw4OQG3i4r3sajAUhAwNF0khBAacQPXS4QzoPwwyg2U40AUfr0c5fPFm3Cu+QqL K914KDz8Fuk3ywZs5UOfVItBohzYSTdllAT6WJdijotYEUqwMGCBsW6W7CILaUeIQfZT Ya5WtLhUAYlJpK3gFOEG+ySokDWZMcTGsE+wtZzk8XnHOiKZXdXkBz+LBUbRP4PrkhWc zk7vkIcWtv4w9patCAHIGHZ00kYNba45PXa0GZwW9KAoVAtnGrfC7N/3O4SdAvDKsdTR uWpgf0PEJQfnkC97lL3sxSSN4ctJGkh1tfGZqA2M01j0wVLBNQgVBboDYdfmbBPBHRyg q9bQ== X-Gm-Message-State: AOAM531w017Ii4Jaf0McFOXqwYncEa1mpAx3K4YLWOb8nCmE9JYKo8Na R+DiK/ry56iCt3vKfQ2QTJ+ftZl6EO0= X-Google-Smtp-Source: ABdhPJyxAfLoGXytU2DE+DJQ2pZS3+BXVP466QW1vnCUgfMwFryArrI3BAtqHZvNDLeGTEj0IHtNjA== X-Received: by 2002:ab0:6f0a:: with SMTP id r10mr2769734uah.106.1637633098201; Mon, 22 Nov 2021 18:04:58 -0800 (PST) Received: from tresc043793.tre-sc.gov.br (187-049-235-234.floripa.net.br. [187.49.235.234]) by smtp.gmail.com with ESMTPSA id bk3sm5433901vkb.33.2021.11.22.18.04.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Nov 2021 18:04:57 -0800 (PST) From: luizluca@gmail.com To: openwrt-devel@lists.openwrt.org Cc: nbd@nbd.name, Luiz Angelo Daros de Luca <luizluca@gmail.com> Subject: [PATCH 1/2] interface-ip: use metric when looking for a route Date: Mon, 22 Nov 2021 23:04:51 -0300 Message-Id: <20211123020452.25669-1-luizluca@gmail.com> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211122_180500_447570_D77530E9 X-CRM114-Status: UNSURE ( 9.38 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Luiz Angelo Daros de Luca When there were multiple routes with the same target but different metrics, __find_ip_route_target was returning the first one, independently of the metric. Signed-off-by: Luiz Angelo Daros de Luca --- interface-ip.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:932 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [luizluca[at]gmail.com] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List <openwrt-devel.lists.openwrt.org> List-Unsubscribe: <https://lists.openwrt.org/mailman/options/openwrt-devel>, <mailto:openwrt-devel-request@lists.openwrt.org?subject=unsubscribe> List-Archive: <http://lists.openwrt.org/pipermail/openwrt-devel/> List-Post: <mailto:openwrt-devel@lists.openwrt.org> List-Help: <mailto:openwrt-devel-request@lists.openwrt.org?subject=help> List-Subscribe: <https://lists.openwrt.org/mailman/listinfo/openwrt-devel>, <mailto:openwrt-devel-request@lists.openwrt.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "openwrt-devel" <openwrt-devel-bounces@lists.openwrt.org> Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org |
Series |
[1/2] interface-ip: use metric when looking for a route
|
expand
|
diff --git a/interface-ip.c b/interface-ip.c index 648f521..7b63ef9 100644 --- a/interface-ip.c +++ b/interface-ip.c @@ -234,7 +234,9 @@ __find_ip_route_target(struct interface_ip_settings *ip, union if_addr *a, if (route->flags & DEVROUTE_TABLE) continue; - if (!*res || route->mask > (*res)->mask) + if (!*res || route->mask > (*res)->mask || + ((route->mask == (*res)->mask) && (route->flags & DEVROUTE_METRIC) + && (route->metric < (*res)->metric))) *res = route; } }