packages: ipv6/tayga: move static mappings to 'firewall' config

[packages.git] / ipv6 / tayga / files / tayga.sh

diff --git a/ipv6/tayga/files/tayga.sh b/ipv6/tayga/files/tayga.sh
index 36c33de..96d132d 100644 (file)
--- a/ipv6/tayga/files/tayga.sh
+++ b/ipv6/tayga/files/tayga.sh
@@ -32,14 +32,25 @@ coldplug_interface_tayga() {
        setup_interface_tayga "tayga-$1" "$1"
 }
 
-conf_rule_add() {
-       local cfg="$1"
-       local tmpconf="$2"
-       local ipv4_addr ipv6_addr
-       config_get ipv4_addr "$cfg" ipv4_addr ""
-       config_get ipv6_addr "$cfg" ipv6_addr ""
-       [ -n "$ipv4_addr" ] && [ -n "$ipv6_addr" ] &&
-               echo "map $ipv4_addr $ipv6_addr" >>$tmpconf
+tayga_add_static_mappings() {
+       local tmpconf="$1"
+
+       (
+               . /etc/functions.sh
+               config_load firewall
+
+               tayga_map_rule_add() {
+                       local cfg="$1"
+                       local tmpconf="$2"
+                       local ipv4_addr ipv6_addr
+                       config_get ipv4_addr "$cfg" ipv4_addr ""
+                       config_get ipv6_addr "$cfg" ipv6_addr ""
+                       [ -n "$ipv4_addr" ] && [ -n "$ipv6_addr" ] &&
+                               echo "map $ipv4_addr $ipv6_addr" >>$tmpconf
+               }
+
+               config_foreach tayga_map_rule_add nat64 "$tmpconf"
+       )
 }
 
 setup_interface_tayga() {
@@ -96,7 +107,7 @@ setup_interface_tayga() {
        [ -n "$prefix" ] &&
                echo "prefix $prefix" >>$tmpconf
 
-       config_foreach conf_rule_add map_rule "$tmpconf"
+       tayga_add_static_mappings "$tmpconf"
 
        [ -n "$dynamic_pool" ] &&
                echo "dynamic-pool $dynamic_pool" >>$tmpconf