ds-lite: Add support for IPIP6(RFC2473) tunnel

Add Generic Packet Tunneling in IPv6 Specification (RFC 2473) support.

Signed-off-by: Arayuki Mago <ms@missing233.com>
Signed-off-by: Chuanhong Guo <gch981213@gmail.com>

diff --git a/package/network/ipv6/ds-lite/Makefile b/package/network/ipv6/ds-lite/Makefile
index 502da366a92e6730dd48c60aacf6a6bf2cba8b02..37c3449ab2a76cebb17d9dfa968f90522e8b9516 100644 (file)
--- a/package/network/ipv6/ds-lite/Makefile
+++ b/package/network/ipv6/ds-lite/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ds-lite
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ds-lite

-PKG_RELEASE:=8
+PKG_RELEASE:=9

 PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk
 PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk


@@ -17,13 +17,13 @@ define Package/ds-lite
   SECTION:=net
   CATEGORY:=Network
   DEPENDS:=@IPV6 +kmod-ip6-tunnel +resolveip
   SECTION:=net
   CATEGORY:=Network
   DEPENDS:=@IPV6 +kmod-ip6-tunnel +resolveip

-  TITLE:=Dual-Stack Lite (DS-Lite) configuration support
+  TITLE:=IPv4 over IPv6 (RFC2473 and DS-Lite) configuration support

   MAINTAINER:=Steven Barth <steven@midlink.org>
   PKGARCH:=all
 endef
 
 define Package/ds-lite/description
   MAINTAINER:=Steven Barth <steven@midlink.org>
   PKGARCH:=all
 endef
 
 define Package/ds-lite/description

-Provides support for Dual-Stack Lite in /etc/config/network.
+Provides support for IPv4 over IPv6 (RFC2473 and DS-Lite) in /etc/config/network.

 Refer to http://wiki.openwrt.org/doc/uci/network for
 configuration details.
 endef
 Refer to http://wiki.openwrt.org/doc/uci/network for
 configuration details.
 endef

diff --git a/package/network/ipv6/ds-lite/files/dslite.sh b/package/network/ipv6/ds-lite/files/dslite.sh
index 017963926db62b84b7e23b8e905fb1fb0a6f097b..325401b98b55e31c3f8de693683cb7332170e3e4 100644 (file)
--- a/package/network/ipv6/ds-lite/files/dslite.sh
+++ b/package/network/ipv6/ds-lite/files/dslite.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 #!/bin/sh

-# dslite.sh - IPv4-in-IPv6 tunnel backend
+# dslite.sh - IPv4-in-IPv6 tunnel backend for ipip6 and ds-lite

 # Copyright (c) 2013 OpenWrt.org
 # Copyright (c) 2013 OpenWrt.org

+# Copyright (c) 2013 Steven Barth <steven@midlink.org>
+# Copyright (c) 2021 Kenji Uno <ku@digitaldolphins.jp>
+# Copyright (c) 2024 Arayuki Mago <ms@missing233.com>

 
 [ -n "$INCLUDE_ONLY" ] || {
        . /lib/functions.sh
 
 [ -n "$INCLUDE_ONLY" ] || {
        . /lib/functions.sh


@@ -9,10 +12,13 @@
        init_proto "$@"
 }
 
        init_proto "$@"
 }
 

-proto_dslite_setup() {
+tnl_setup() {

        local cfg="$1"
        local iface="$2"
        local cfg="$1"
        local iface="$2"

-       local link="ds-$cfg"
+       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
        local remoteip6
 
        local mtu ttl peeraddr ip6addr tunlink zone weakif encaplimit


@@ -59,7 +65,7 @@ proto_dslite_setup() {
 
        proto_init_update "$link" 1
        proto_add_ipv4_route "0.0.0.0" 0
 
        proto_init_update "$link" 1
        proto_add_ipv4_route "0.0.0.0" 0

-       proto_add_ipv4_address "192.0.0.2" "" "" "192.0.0.1"
+       proto_add_ipv4_address "$ip4addr" "" "" "$ip4gateway"

 
        proto_add_tunnel
        json_add_string mode ipip6
 
        proto_add_tunnel
        json_add_string mode ipip6


@@ -76,23 +82,22 @@ proto_dslite_setup() {
        proto_add_data
        [ -n "$zone" ] && json_add_string zone "$zone"
 
        proto_add_data
        [ -n "$zone" ] && json_add_string zone "$zone"
 

-       json_add_array firewall
-         json_add_object ""
-           json_add_string type nat
-           json_add_string target ACCEPT
-         json_close_object
-       json_close_array
+       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"
 }
 
        proto_close_data
 
        proto_send_update "$cfg"
 }
 

-proto_dslite_teardown() {
-       local cfg="$1"
-}
-
-proto_dslite_init_config() {
-       no_device=1             
+init_config() {
+       no_device=1

        available=1
 
        proto_config_add_string "ip6addr"
        available=1
 
        proto_config_add_string "ip6addr"


@@ -105,6 +110,34 @@ proto_dslite_init_config() {
        proto_config_add_string "weakif"
 }
 
        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" ] || {
 [ -n "$INCLUDE_ONLY" ] || {

-        add_protocol dslite
+       add_protocol ipip6
+       add_protocol dslite

 }
 }