From patchwork Mon Feb 12 17:01:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ms@missing233.com X-Patchwork-Id: 1897837 X-Patchwork-Delegate: gch981213@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=IOgE24ji; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=missing233.com header.i=@missing233.com header.a=rsa-sha256 header.s=qjcj2303 header.b=qtjs9RMn; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TYW463JjYz23hM for ; Tue, 13 Feb 2024 04:03:02 +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:References:In-Reply-To: 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: List-Owner; bh=FD9YxjKhkPyGXt2/9W8o//lHJysd938KU/eEUsqJydA=; b=IOgE24ji7aZO37 N5K4KRllHD+ZJ0gnAWu+iVq3uW+ivZ0yxsUljeA/cI7BVzWI5hvQvSriaBOHWTP6u13r0+8GeTWjY 7rLu8Hg37f5GFOUMamfJFNmTa92LJyQEQJIJpXfjYXCx5HG/RdS7ByCBkP31rOTyZVrnCVvYB2K+k Uy5DwGGL1oVIVUpgRbk4bVGZ3xUs7QpLE56hpNeEaflerrBl0X45Julap2cpKlX8rjx3Bliwo2OHd lj7R7zEHc2x117LE/CFp/hUTNLrEkC3SxLnDlHVlOk+O+QdwONve2YbEUql3Hx5o2A06KBqyNlzbl V60SSi6+37NfI/VVDG8Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rZZh5-00000006IsG-17yD; Mon, 12 Feb 2024 17:02:11 +0000 Received: from bg4.exmail.qq.com ([43.154.221.58]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rZZh1-00000006Ipd-2oIB for openwrt-devel@lists.openwrt.org; Mon, 12 Feb 2024 17:02:09 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=missing233.com; s=qjcj2303; t=1707757324; bh=OzvHILSBgiozD6PfbTtBLKcRUEZrG7BxS0LiJqf2TIM=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=qtjs9RMnpzRXPlYnrdulocelq3AzRfm8nQfMUK7f3zN0PATTUbfHpz3p/nE208VPK wz5YtmnCf81L/Yfa3+cS/e+Fv2PUHDaKt4VTmHbC1RV49bvT25jn9VVBCjidg8NRWq qyBK+u/xmdrcU3z8KQ7Nx0JCRypwISy8Oh6VGUEQ= X-QQ-mid: bizesmtp70t1707757321t9afpp46 X-QQ-Originating-IP: GX5OuYlkMP7JKjkbeQ4TzqRgMi422ERMH1HYe6K4lOA= Received: from localhost.localdomain ( [126.55.221.162]) by bizesmtp.qq.com (ESMTP) with id ; Tue, 13 Feb 2024 01:01:54 +0800 (CST) X-QQ-SSF: 0100000000000030D000000A0000000 X-QQ-FEAT: iChVH899NlusuJqh+nMN4si1eF43OkuyHLVK74+62sExMZaX28JPM0kXNjEpz XUiTiKzSXujBqK6rndjnmanDRT14S8a86lAPHlPetkX+7lhwf5Bkvi9l7rvjy9Xzu6omkV1 4yWT8y9JuznVsJRLrYRWnAlnAFmCwCA+kgmo045MaulTMN4wnGoTX8aXWR7M5TMPw6JodkO figUeeidGFCjIGV4E4DB8zsLefOQHQgq2oX9RwiXcpYeOoaWVlK4HGmPNYELXCuFRmd2tLu bhAFiCteuEPryud+4mNkd0qCvmGJMZX3zuG8t3SUlZEnNiprKzVgHby3gVKqByCWh/Svpdh V+v7d2JAbFiGkhgc7mc0smYJBqP+B1UX8j4tgZsi4I35sJDoz/LHqn+Us1qOw== X-QQ-GoodBg: 0 X-BIZMAIL-ID: 1120979323250385688 From: ms@missing233.com To: openwrt-devel@lists.openwrt.org Cc: Arayuki Mago Subject: [PATCH 3/3] ipip6/ds-lite: Remove ds-lite and update ipip6 for compatibility Date: Tue, 13 Feb 2024 02:01:16 +0900 Message-Id: <20240212170116.1897-3-ms@missing233.com> X-Mailer: git-send-email 2.40.1.windows.1 In-Reply-To: <20240212170116.1897-1-ms@missing233.com> References: <20240212170116.1897-1-ms@missing233.com> MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:missing233.com:qybglogicsvrgz:qybglogicsvrgz7a-1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240212_090208_072646_068BA2F8 X-CRM114-Status: GOOD ( 13.48 ) 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: Arayuki Mago - Remove ds-lite package. - Add `PROVIDES:=ds-lite` to ipip6 for seamless transition. Signed-off-by: Arayuki Mago --- package/network/ipv6/ds-lite/Makefile | 42 ------ package/network/ipv6/ds-lite/files/ipip6.sh | 138 package/network/ipv6/ipip6/ [...] 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 [43.154.221.58 listed in list.dnswl.org] 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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 -0.0 T_SCC_BODY_TEXT_LINE No description available. 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: Arayuki Mago - Remove ds-lite package. - Add `PROVIDES:=ds-lite` to ipip6 for seamless transition. Signed-off-by: Arayuki Mago --- package/network/ipv6/ds-lite/Makefile | 42 ------ package/network/ipv6/ds-lite/files/ipip6.sh | 138 -------------------- package/network/ipv6/ipip6/Makefile | 1 + package/network/ipv6/ipip6/files/ipip6.sh | 5 +- 4 files changed, 3 insertions(+), 183 deletions(-) delete mode 100644 package/network/ipv6/ds-lite/Makefile delete mode 100644 package/network/ipv6/ds-lite/files/ipip6.sh diff --git a/package/network/ipv6/ds-lite/Makefile b/package/network/ipv6/ds-lite/Makefile deleted file mode 100644 index a6ea315c88..0000000000 --- a/package/network/ipv6/ds-lite/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# -# Copyright (C) 2013 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=ds-lite -PKG_RELEASE:=8 -PKG_LICENSE:=GPL-2.0 - -include $(INCLUDE_DIR)/package.mk - -define Package/ds-lite - SECTION:=net - CATEGORY:=Network - DEPENDS:=@IPV6 +kmod-ip6-tunnel +resolveip - TITLE:=Dual-Stack Lite (DS-Lite) configuration support - MAINTAINER:=Steven Barth - PKGARCH:=all -endef - -define Package/ds-lite/description -Provides support for Dual-Stack Lite in /etc/config/network. -Refer to http://wiki.openwrt.org/doc/uci/network for -configuration details. -endef - -define Build/Compile -endef - -define Build/Configure -endef - -define Package/ds-lite/install - $(INSTALL_DIR) $(1)/lib/netifd/proto - $(INSTALL_BIN) ./files/ipip6.sh $(1)/lib/netifd/proto/ipip6.sh -endef - -$(eval $(call BuildPackage,ds-lite)) diff --git a/package/network/ipv6/ds-lite/files/ipip6.sh b/package/network/ipv6/ds-lite/files/ipip6.sh deleted file mode 100644 index 5c2755df76..0000000000 --- a/package/network/ipv6/ds-lite/files/ipip6.sh +++ /dev/null @@ -1,138 +0,0 @@ -#!/bin/sh -# ipip6.sh - IPv4-in-IPv6 tunnel backend for ipip6 and ds-lite -# Copyright (c) 2013 OpenWrt.org - -[ -n "$INCLUDE_ONLY" ] || { - . /lib/functions.sh - . /lib/functions/network.sh - . ../netifd-proto.sh - init_proto "$@" -} - -tnl_setup() { - local cfg="$1" - local iface="$2" - local tnl_type="$3" - local ip4addr="$4" - local ip4gateway="$5" - local link="$tnl_type-$cfg" - local remoteip6 - - local mtu ttl peeraddr ip6addr tunlink zone weakif encaplimit - json_get_vars mtu ttl peeraddr ip6addr tunlink zone weakif encaplimit - - [ -z "$peeraddr" ] && { - proto_notify_error "$cfg" "MISSING_ADDRESS" - proto_block_restart "$cfg" - return - } - - proto_add_host_dependency "$cfg" "::" "$tunlink" - - remoteip6=$(resolveip -6 "$peeraddr") - if [ -z "$remoteip6" ]; then - sleep 3 - remoteip6=$(resolveip -6 "$peeraddr") - if [ -z "$remoteip6" ]; then - proto_notify_error "$cfg" "AFTR_DNS_FAIL" - return - fi - fi - - peeraddr=$(echo "$remoteip6" | head -n 1) - - [ -z "$ip6addr" ] && { - local wanif="$tunlink" - if [ -z "$wanif" ] && ! network_find_wan6 wanif; then - proto_notify_error "$cfg" "NO_WAN_LINK" - return - fi - - if ! network_get_ipaddr6 ip6addr "$wanif"; then - [ -z "$weakif" ] && weakif="lan" - if ! network_get_ipaddr6 ip6addr "$weakif"; then - proto_notify_error "$cfg" "NO_WAN_LINK" - return - fi - fi - } - - proto_init_update "$link" 1 - proto_add_ipv4_route "0.0.0.0" 0 - proto_add_ipv4_address "$ip4addr" "" "" "$ip4gateway" - - proto_add_tunnel - json_add_string mode ipip6 - json_add_int mtu "${mtu:-1280}" - json_add_int ttl "${ttl:-64}" - json_add_string local "$ip6addr" - json_add_string remote "$peeraddr" - [ -n "$tunlink" ] && json_add_string link "$tunlink" - json_add_object "data" - [ -n "$encaplimit" ] && json_add_string encaplimit "$encaplimit" - json_close_object - proto_close_tunnel - - proto_add_data - [ -n "$zone" ] && json_add_string zone "$zone" - - if [ "$tnl_type" = "ds" ]; then - json_add_array firewall - json_add_object "" - json_add_string type nat - json_add_string target ACCEPT - json_close_object - json_close_array - fi - - proto_close_data - - proto_send_update "$cfg" -} - -init_config() { - no_device=1 - available=1 - - proto_config_add_string "ip6addr" - proto_config_add_string "peeraddr" - proto_config_add_string "tunlink" - proto_config_add_int "mtu" - proto_config_add_int "ttl" - proto_config_add_string "encaplimit" - proto_config_add_string "zone" - proto_config_add_string "weakif" -} - -proto_ipip6_init_config() { - init_config - proto_config_add_string "ip4ifaddr" -} - -proto_ipip6_setup() { - local ip4ifaddr - json_get_vars ip4ifaddr - tnl_setup "$1" "$2" "ipip6" "$ip4ifaddr" "0.0.0.0" -} - -proto_ipip6_teardown() { - local cfg="$1" -} - -proto_dslite_init_config() { - init_config -} - -proto_dslite_setup() { - tnl_setup "$1" "$2" "ds" "192.0.0.2" "192.0.0.1" -} - -proto_dslite_teardown() { - local cfg="$1" -} - -[ -n "$INCLUDE_ONLY" ] || { - - add_protocol ipip6; - add_protocol dslite; -} diff --git a/package/network/ipv6/ipip6/Makefile b/package/network/ipv6/ipip6/Makefile index 32d16181b0..37f79e1e91 100644 --- a/package/network/ipv6/ipip6/Makefile +++ b/package/network/ipv6/ipip6/Makefile @@ -21,6 +21,7 @@ define Package/ipip6 DEPENDS:=@IPV6 +kmod-ip6-tunnel +resolveip TITLE:=IPv4 over IPv6 (RFC2473/DS-Lite) configuration support MAINTAINER:=missing233 + PROVIDES:=ds-lite PKGARCH:=all endef diff --git a/package/network/ipv6/ipip6/files/ipip6.sh b/package/network/ipv6/ipip6/files/ipip6.sh index 1fcf21adf5..7a206cbb99 100644 --- a/package/network/ipv6/ipip6/files/ipip6.sh +++ b/package/network/ipv6/ipip6/files/ipip6.sh @@ -134,7 +134,6 @@ proto_dslite_teardown() { } [ -n "$INCLUDE_ONLY" ] || { - - add_protocol ipip6; - add_protocol dslite; + add_protocol ipip6 + add_protocol dslite }