From patchwork Fri May 14 09:21:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 1478369 X-Patchwork-Delegate: zajec5@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1:d65d:64ff:fe57:4e05; helo=desiato.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=desiato.20200630 header.b=jBDW4bR/; 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=mMclTHM8; dkim-atps=neutral Received: from desiato.infradead.org (desiato.infradead.org [IPv6:2001:8b0:10b:1:d65d:64ff:fe57:4e05]) (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 ozlabs.org (Postfix) with ESMTPS id 4FhNPW75DLz9sW4 for ; Fri, 14 May 2021 19:23:43 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; 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=zDs0WbJGdd4xbaHLc7B23u/M5imcia9aF0OsCL8+XAM=; b=jBDW4bR/CZMFwpdN5p0SU39LcH /uzmDsB/lVe9l8ld6WPhHfaE2gx+lsG2Zalui8O9Jrqr+y8yaanaZnHvKp7l/7ImamPj7+q+Qi5zX zLYgb8uui8QVsT0gc4bsfQSKYTafA+uukrQcYtb0cFRANPMWmdymIm+GoGlytkM+z28MVf27FNsRV KypjObautPw32oFV2MBGgmsrkQA57/EO+35YcOdP0omBeydvo/6mbw9FTP5gfvbxXuUhe0bZgLdSz VdY8ubiM2n9K2Gvag9UqOrgiEPq9vG0GJPy2FQa/0i9oA9mXqGH/tKCMeDbq1IC01ueHX2vDw1Rzq b/gAaYqw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lhU18-007c8e-OI; Fri, 14 May 2021 09:21:58 +0000 Received: from mail-lf1-x12b.google.com ([2a00:1450:4864:20::12b]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lhU13-007c7u-WE for openwrt-devel@lists.openwrt.org; Fri, 14 May 2021 09:21:56 +0000 Received: by mail-lf1-x12b.google.com with SMTP id z9so42191270lfu.8 for ; Fri, 14 May 2021 02:21:53 -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:mime-version :content-transfer-encoding; bh=v9GFxBjPk+busYaaydi+jT2OJEsO+PlKDk0/K5pMeEw=; b=mMclTHM8SrTYNQWuzu0jWJ3UdgE+TPa1yBhNUfdpbajgE5iS5uZ4C3OFZQRRhuboG+ LQpJuladYKtTPmmdjYeSyY/dB3Sx+IGW8oOYkl30yqs7vEDTJjOXG1pZ10x4I7zqTKoN XG5QA+o4wHiX0vsIcOvSX/2YCAxGZqmiWY5Gjmy+zTLgrwrEqAyFtLp3vvTR86NValKj eAqC3LdNF/f3ADydpQDWF/OhhpY+s8Ub91MqEHloNxBubCphYCzUZ385KeFWB6+/laQw w/sF4Xy1KeV6q720i5XOMJKfNZ0tHjkomc6Lbs/BucsURuaB1MZHt+rDAMBm11l8DIQB vOIQ== 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:mime-version :content-transfer-encoding; bh=v9GFxBjPk+busYaaydi+jT2OJEsO+PlKDk0/K5pMeEw=; b=Zwc2z7KpQUCLpt3GxY6Ioa+sXI1vcCVe40tIZ0qBe8iafvHSnbYDUbZZTUxggtcwJG /X42xr7XWn82yeeOqWabFjp63IFDUgumGbR/N5f+sKHKj6TaLxyY+Lmt47iWsXMuEWsK IryL3sTNJeDyq+dhiRL9jLDBioHo8ODEdy1h3ka6Fw7KuDOo5B5fQo9MqmwIX5waZ9DT h9vAZsj+665fPncitOA7aYjOjjerNnWlTLJHKWz1I9K1SyuqUUcK3xMVHQBT4MwalIDh 28NxzhqNVn+IhIvolqWAoTvG/1UOItAFg2nPDwZ+uBUj6YV260kJBwfvNjxZZw/h3NBN KAaQ== X-Gm-Message-State: AOAM532c8wLM5hu/NBO8FHrCfovCFxLRV6CgyDKN8IIguJ/xLZCP+c2s 3wiaQqXNiZERsS91u/0A3Ik= X-Google-Smtp-Source: ABdhPJxvWSrw/3efFSpm3jk6HCN5aggBMFqTEfM3uSSb4zCDo1QXbe5LnBdFBbLEVU/R42+8AidSFg== X-Received: by 2002:a05:6512:11f0:: with SMTP id p16mr17354129lfs.520.1620984113148; Fri, 14 May 2021 02:21:53 -0700 (PDT) Received: from localhost.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id p33sm573154lfa.43.2021.05.14.02.21.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 May 2021 02:21:52 -0700 (PDT) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: Jo-Philipp Wich , Hans Dedecker , John Crispin , Felix Fietkau , openwrt-devel@lists.openwrt.org Cc: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= Subject: [PATCH] base-files: use "ports" array in board.json network for bridges Date: Fri, 14 May 2021 11:21:47 +0200 Message-Id: <20210514092147.30666-1-zajec5@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210514_102154_724537_D2222D18 X-CRM114-Status: GOOD ( 12.18 ) X-Spam-Score: 0.1 (/) X-Spam-Report: =?unknown-8bit?q?Spam_detection_software=2C_running_on_the_sy?= =?unknown-8bit?q?stem_=22desiato=2Einfradead=2Eorg=22=2C?= =?unknown-8bit?q?_has_NOT_identified_this_incoming_email_as_spam=2E__The_ori?= =?unknown-8bit?q?ginal?= =?unknown-8bit?q?_message_has_been_attached_to_this_so_you_can_view_it_or_la?= =?unknown-8bit?q?bel?= =?unknown-8bit?q?_similar_future_email=2E__If_you_have_any_questions=2C_see?= =?unknown-8bit?q?_the_administrator_of_that_system_for_details=2E?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_preview=3A__From=3A_Rafa=C5=82_Mi=C5=82ecki_Bridge?= =?unknown-8bit?q?_aggregates_multiple_ports_so?= =?unknown-8bit?q?_use_a_more_accurate_name_=28=22ports=22=29_and_format_=28a?= =?unknown-8bit?q?rray=29_for_storing_them_in?= =?unknown-8bit?q?_board=2Ejson=2E_Example=3A_?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_analysis_details=3A___=280=2E1_points=2C_5=2E0_req?= =?unknown-8bit?q?uired=29?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_pts_rule_name______________description?= =?unknown-8bit?q?_----_----------------------_------------------------------?= =?unknown-8bit?q?--------------------?= =?unknown-8bit?q?_-0=2E0_RCVD=5FIN=5FDNSWL=5FNONE_____RBL=3A_Sender_listed_a?= =?unknown-8bit?q?t_https=3A//www=2Ednswl=2Eorg/=2C?= =?unknown-8bit?q?_no_trust?= =?unknown-8bit?b?IFsyYTAwOjE0NTA6NDg2NDoyMDowOjA6MDoxMmIgbGlzdGVkIGluXQ==?= =?unknown-8bit?b?IFtsaXN0LmRuc3dsLm9yZ10=?= =?unknown-8bit?q?_-0=2E0_SPF=5FPASS_______________SPF=3A_sender_matches_SPF_?= =?unknown-8bit?q?record?= =?unknown-8bit?q?_0=2E0_SPF=5FHELO=5FNONE__________SPF=3A_HELO_does_not_publ?= =?unknown-8bit?q?ish_an_SPF_Record?= =?unknown-8bit?q?_0=2E2_FREEMAIL=5FENVFROM=5FEND=5FDIGIT_Envelope-from_freem?= =?unknown-8bit?q?ail_username_ends?= =?unknown-8bit?q?_in_digit?= =?unknown-8bit?q?_=5Bzajec5=5Bat=5Dgmail=2Ecom=5D?= =?unknown-8bit?q?_0=2E0_FREEMAIL=5FFROM__________Sender_email_is_commonly_ab?= =?unknown-8bit?q?used_enduser_mail?= =?unknown-8bit?q?_provider?= =?unknown-8bit?q?_=5Bzajec5=5Bat=5Dgmail=2Ecom=5D?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID_____________Message_has_at_least_one_v?= =?unknown-8bit?q?alid_DKIM_or_DK_signature?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FAU__________Message_has_a_valid_DKIM?= =?unknown-8bit?q?_or_DK_signature_from?= =?unknown-8bit?q?_author=27s_domain?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FEF__________Message_has_a_valid_DKIM?= =?unknown-8bit?q?_or_DK_signature_from?= =?unknown-8bit?q?_envelope-from_domain?= =?unknown-8bit?q?_0=2E1_DKIM=5FSIGNED____________Message_has_a_DKIM_or_DK_si?= =?unknown-8bit?q?gnature=2C_not_necessarily?= =?unknown-8bit?q?_valid?= X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Rafał Miłecki Bridge aggregates multiple ports so use a more accurate name ("ports") and format (array) for storing them in board.json. Example: "network": { "lan": { "ports": [ "lan1", "lan2", "lan3", "lan4" ], "protocol": "static" }, "wan": { "ifname": "wan", "protocol": "dhcp" } } Signed-off-by: Rafał Miłecki --- package/base-files/files/bin/config_generate | 5 ++++- package/base-files/files/lib/functions/uci-defaults.sh | 8 +++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate index ee3958e733..a99f4f5968 100755 --- a/package/base-files/files/bin/config_generate +++ b/package/base-files/files/bin/config_generate @@ -91,15 +91,18 @@ generate_static_network() { addr_offset=2 generate_network() { - local ifname macaddr protocol type ipaddr netmask vlan + local ports ifname macaddr protocol type ipaddr netmask vlan local bridge=$2 json_select network json_select "$1" + json_get_values ports ports json_get_vars ifname macaddr protocol ipaddr netmask vlan json_select .. json_select .. + [ -n "$ports" ] && ifname="$ports" + [ -n "$ifname" ] || return # force bridge for multi-interface devices (and lan) diff --git a/package/base-files/files/lib/functions/uci-defaults.sh b/package/base-files/files/lib/functions/uci-defaults.sh index 134c527d8d..407a9c710f 100644 --- a/package/base-files/files/lib/functions/uci-defaults.sh +++ b/package/base-files/files/lib/functions/uci-defaults.sh @@ -39,7 +39,13 @@ ucidef_set_interface() { [ -n "$opt" -a -n "$val" ] || break - json_add_string "$opt" "$val" + [ "$opt" = "ifname" -a "$val" != "${val/ //}" ] && { + json_select_array "ports" + for e in $val; do json_add_string "" "$e"; done + json_close_array + } || { + json_add_string "$opt" "$val" + } done if ! json_is_a protocol string; then