From patchwork Wed Sep 9 13:45:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Dedecker X-Patchwork-Id: 515863 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id C173C1402AB for ; Wed, 9 Sep 2015 23:48:54 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=O8rnS1+v; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 659E828C003; Wed, 9 Sep 2015 15:45:43 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 269CC28BDF9 for ; Wed, 9 Sep 2015 15:45:16 +0200 (CEST) X-policyd-weight: using cached result; rate: -8.5 Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Wed, 9 Sep 2015 15:45:13 +0200 (CEST) Received: by wiclk2 with SMTP id lk2so22546834wic.1 for ; Wed, 09 Sep 2015 06:46:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Menic0Zsr8xmb/udZ1S7lzdWmTrVrPrwtT7H+04yXuY=; b=O8rnS1+vjcM6X3uPgjfgn7P/ImegnYw0v2SJYzXzPx5l5M/MtlCafYt8yOX6+lqp2b SGu2N/+WmUy6NBmnUjHWzoSpcRQjGiOGiodqcZPp7iOBCLkMThlJafbEZDj0U4Ccgi3a Oum2uwTTmchq3/571lTITjZahnv+2QFd3RSUEMQuN3/ywvaK9EKPufFBaz8wtFiz9GXN AYLWX1+k2r0c78UBnn8+6hMUlSwSrth7x2ogBYZA3ZnNPfi9slY8goaMAj4FwwuYrCAh Cwn5GTyY/76ioZf3wvSSV3qpTgNZE8hLR1DbhGuTYVKWPUvvyhkXsyDXbGYzK1V+76ej 3uDA== X-Received: by 10.194.205.68 with SMTP id le4mr62829948wjc.74.1441806378156; Wed, 09 Sep 2015 06:46:18 -0700 (PDT) Received: from cplx43.eu.thmulti.com ([141.11.62.7]) by smtp.gmail.com with ESMTPSA id fu5sm6764421wic.0.2015.09.09.06.46.17 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 09 Sep 2015 06:46:17 -0700 (PDT) From: Hans Dedecker To: openwrt-devel@lists.openwrt.org Date: Wed, 9 Sep 2015 15:45:50 +0200 Message-Id: <1441806352-18030-4-git-send-email-dedeckeh@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1441806352-18030-1-git-send-email-dedeckeh@gmail.com> References: <1441806352-18030-1-git-send-email-dedeckeh@gmail.com> Cc: Hans Dedecker , cyrus@openwrt.org Subject: [OpenWrt-Devel] [PATCH netifd 4/6] interface-ip: Insert network and address ip rules for external addresses as well X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Signed-off-by: Hans Dedecker --- interface-ip.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/interface-ip.c b/interface-ip.c index 6c152b6..43b63c7 100644 --- a/interface-ip.c +++ b/interface-ip.c @@ -500,9 +500,7 @@ interface_update_proto_addr(struct vlist_tree *tree, } if (node_old) { - if (!(a_old->flags & DEVADDR_EXTERNAL) && a_old->enabled && !keep) { - interface_handle_subnet_route(iface, a_old, false); - + if (a_old->enabled && !keep) { if ((a_old->flags & DEVADDR_FAMILY) == DEVADDR_INET6) v6 = true; @@ -519,7 +517,10 @@ interface_update_proto_addr(struct vlist_tree *tree, a_old->mask, table, NULL, NULL); } - system_del_address(dev, a_old); + if (!(a_old->flags & DEVADDR_EXTERNAL)) { + interface_handle_subnet_route(iface, a_old, false); + system_del_address(dev, a_old); + } } free(a_old->pclass); free(a_old); @@ -527,9 +528,14 @@ interface_update_proto_addr(struct vlist_tree *tree, if (node_new) { a_new->enabled = true; - if (!(a_new->flags & DEVADDR_EXTERNAL) && (!keep || replace)) { - if (system_add_address(dev, a_new)) - a_new->failed = true; + if (!keep || replace) { + if (!(a_new->flags & DEVADDR_EXTERNAL)) { + if (system_add_address(dev, a_new)) + a_new->failed = true; + + if (iface->metric) + interface_handle_subnet_route(iface, a_new, true); + } if (!keep) { if ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET6) @@ -544,9 +550,6 @@ interface_update_proto_addr(struct vlist_tree *tree, a_new->mask, table, NULL, NULL); } } - - if (iface->metric) - interface_handle_subnet_route(iface, a_new, true); } } }