fw4: gracefully handle unsupported hardware offloading
[project/firewall4.git] / root / usr / share / ucode / fw4.uc
index ba34c82861f1ec9393dc45c0301ddf34a7428ee9..9d2a0b49c18c7899b7beb9409764eabf0232aea9 100644 (file)
@@ -116,6 +116,7 @@ let dscp_classes = {
        "CS6": 0x30,
        "CS7": 0x38,
        "BE": 0x00,
+       "LE": 0x01,
        "AF11": 0x0a,
        "AF12": 0x0c,
        "AF13": 0x0e,
@@ -242,6 +243,41 @@ function subnets_split_af(x) {
        return rv;
 }
 
+function subnets_group_by_masking(x) {
+       let groups = [], plain = [], nc = [], invert_plain = [], invert_masked = [];
+
+       for (let a in to_array(x)) {
+               if (a.bits == -1 && !a.invert)
+                       push(nc, a);
+               else if (!a.invert)
+                       push(plain, a);
+               else if (a.bits == -1)
+                       push(invert_masked, a);
+               else
+                       push(invert_plain, a);
+       }
+
+       for (let a in nc)
+               push(groups, [ null, null_if_empty(invert_plain), [ a, ...invert_masked ] ]);
+
+       if (length(plain)) {
+               push(groups, [
+                       plain,
+                       null_if_empty(invert_plain),
+                       null_if_empty(invert_masked)
+               ]);
+       }
+       else if (!length(groups)) {
+               push(groups, [
+                       null,
+                       null_if_empty(invert_plain),
+                       null_if_empty(invert_masked)
+               ]);
+       }
+
+       return groups;
+}
+
 function ensure_tcpudp(x) {
        if (length(filter(x, p => (p.name == "tcp" || p.name == "udp"))))
                return true;
@@ -323,6 +359,65 @@ function map_setmatch(set, match, proto) {
        return fields;
 }
 
+function resolve_lower_devices(devstatus, devname) {
+       let dir = fs.opendir("/sys/class/net/" + devname);
+       let devs = [];
+
+       if (dir) {
+               if (!devstatus || devstatus[devname]?.["hw-tc-offload"]) {
+                       push(devs, devname);
+               }
+               else {
+                       let e;
+
+                       while ((e = dir.read()) != null)
+                               if (index(e, "lower_") === 0)
+                                       push(devs, ...resolve_lower_devices(devstatus, substr(e, 6)));
+               }
+
+               dir.close();
+       }
+
+       return devs;
+}
+
+function nft_json_command(...args) {
+       let cmd = [ "/usr/sbin/nft", "--terse", "--json", ...args ];
+       let nft = fs.popen(join(" ", cmd), "r");
+       let info;
+
+       if (nft) {
+               try {
+                       info = filter(json(nft.read("all"))?.nftables,
+                               item => (type(item) == "object" && !item.metainfo));
+               }
+               catch (e) {
+                       warn(sprintf("Unable to parse nftables JSON output: %s\n", e));
+               }
+
+               nft.close();
+       }
+       else {
+               warn(sprintf("Unable to popen() %s: %s\n", cmd, fs.error()));
+       }
+
+       return info || [];
+}
+
+function nft_try_hw_offload(devices) {
+       let nft_test =
+               'add table inet fw4-hw-offload-test; ' +
+               'add flowtable inet fw4-hw-offload-test ft { ' +
+                       'hook ingress priority 0; ' +
+                       'devices = { "' + join('", "', devices) + '" }; ' +
+                       'flags offload; ' +
+               '}';
+
+       let rc = system(sprintf("/usr/sbin/nft -c '%s' 2>/dev/null", replace(nft_test, "'", "'\\''")));
+
+       return (rc == 0);
+}
+
 
 return {
        read_kernel_version: function() {
@@ -339,6 +434,61 @@ return {
                return v;
        },
 
+       resolve_offload_devices: function() {
+               if (!this.default_option("flow_offloading"))
+                       return [];
+
+               let devstatus = null;
+               let devices = [];
+
+               if (this.default_option("flow_offloading_hw")) {
+                       let bus = ubus.connect();
+
+                       if (bus) {
+                               devstatus = bus.call("network.device", "status") || {};
+                               bus.disconnect();
+                       }
+
+                       for (let zone in this.zones())
+                               for (let device in zone.match_devices)
+                                       push(devices, ...resolve_lower_devices(devstatus, device));
+
+                       devices = uniq(devices);
+
+                       if (nft_try_hw_offload(devices))
+                               return devices;
+
+                       this.warn('Hardware flow offloading unavailable, falling back to software offloading');
+                       this.state.defaults.flow_offloading_hw = false;
+               }
+
+               devices = [];
+
+               for (let zone in this.zones())
+                       for (let device in zone.match_devices)
+                               push(devices, ...resolve_lower_devices(null, device));
+
+               return uniq(devices);
+       },
+
+       check_set_types: function() {
+               let sets = {};
+
+               for (let item in nft_json_command("list", "sets", "inet"))
+                       if (item.set?.table == "fw4")
+                               sets[item.set.name] = (type(item.set.type) == "array") ? item.set.type : [ item.set.type ];
+
+               return sets;
+       },
+
+       check_flowtable: function() {
+               for (let item in nft_json_command("list", "flowtables", "inet"))
+                       if (item.flowtable?.table == "fw4" && item.flowtable?.name == "ft")
+                               return true;
+
+               return false;
+       },
+
        read_state: function() {
                let fd = fs.open(STATEFILE, "r");
                let state = null;
@@ -539,18 +689,18 @@ return {
 
 
                //
-               // Build list of forwardings
+               // Build list of rules
                //
 
-               this.cursor.foreach("firewall", "forwarding", f => self.parse_forwarding(f));
+               map(filter(this.state.ubus_rules, r => (r.type == "rule")), r => self.parse_rule(r));
+               this.cursor.foreach("firewall", "rule", r => self.parse_rule(r));
 
 
                //
-               // Build list of rules
+               // Build list of forwardings
                //
 
-               map(filter(this.state.ubus_rules, r => (r.type == "rule")), r => self.parse_rule(r));
-               this.cursor.foreach("firewall", "rule", r => self.parse_rule(r));
+               this.cursor.foreach("firewall", "forwarding", f => self.parse_forwarding(f));
 
 
                //
@@ -664,8 +814,13 @@ return {
 
                                b = to_bits(parts[1]);
 
-                               if (b == null)
-                                       return null;
+                               /* allow non-contiguous masks such as `::ffff:ffff:ffff:ffff` */
+                               if (b == null) {
+                                       b = -1;
+
+                                       for (let i, x in m)
+                                               a[i] &= x;
+                               }
 
                                m = arrtoip(m);
                        }
@@ -1402,7 +1557,10 @@ return {
                    (a.family == 6 && a.bits == 128))
                    return a.addr;
 
-               return sprintf("%s/%d", apply_mask(a.addr, a.bits), a.bits);
+               if (a.bits >= 0)
+                       return sprintf("%s/%d", apply_mask(a.addr, a.bits), a.bits);
+
+               return sprintf("%s/%s", a.addr, a.mask);
        },
 
        host: function(a) {
@@ -1765,8 +1923,9 @@ return {
                        r.devices_neg = null_if_empty(devices[1]);
                        r.devices_neg_wildcard = null_if_empty(devices[2]);
 
-                       r.subnets_pos = map(filter_pos(subnets), this.cidr);
-                       r.subnets_neg = map(filter_neg(subnets), this.cidr);
+                       r.subnets_pos = map(subnets[0], this.cidr);
+                       r.subnets_neg = map(subnets[1], this.cidr);
+                       r.subnets_masked = subnets[2];
 
                        push(match_rules, r);
                };
@@ -1831,41 +1990,29 @@ return {
                        for (let devgroup in devices) {
                                // check if there's no AF specific bits, in this case we can do AF agnostic matching
                                if (!family && !length(match_subnets[0]) && !length(match_subnets[1])) {
-                                       add_rule(0, devgroup, null, zone);
+                                       add_rule(0, devgroup, [], zone);
                                }
 
                                // we need to emit one or two AF specific rules
                                else {
                                        if (family_is_ipv4(zone) && length(match_subnets[0]))
-                                               add_rule(4, devgroup, match_subnets[0], zone);
+                                               for (let subnets in subnets_group_by_masking(match_subnets[0]))
+                                                       add_rule(4, devgroup, subnets, zone);
 
                                        if (family_is_ipv6(zone) && length(match_subnets[1]))
-                                               add_rule(6, devgroup, match_subnets[1], zone);
+                                               for (let subnets in subnets_group_by_masking(match_subnets[1]))
+                                                       add_rule(6, devgroup, subnets, zone);
                                }
                        }
                }
 
                zone.match_rules = match_rules;
 
-               if (masq_src_subnets[0]) {
-                       zone.masq4_src_pos = map(filter_pos(masq_src_subnets[0]), this.cidr);
-                       zone.masq4_src_neg = map(filter_neg(masq_src_subnets[0]), this.cidr);
-               }
-
-               if (masq_src_subnets[1]) {
-                       zone.masq6_src_pos = map(filter_pos(masq_src_subnets[1]), this.cidr);
-                       zone.masq6_src_neg = map(filter_neg(masq_src_subnets[1]), this.cidr);
-               }
-
-               if (masq_dest_subnets[0]) {
-                       zone.masq4_dest_pos = map(filter_pos(masq_dest_subnets[0]), this.cidr);
-                       zone.masq4_dest_neg = map(filter_neg(masq_dest_subnets[0]), this.cidr);
-               }
+               zone.masq4_src_subnets = subnets_group_by_masking(masq_src_subnets[0]);
+               zone.masq4_dest_subnets = subnets_group_by_masking(masq_dest_subnets[0]);
 
-               if (masq_dest_subnets[1]) {
-                       zone.masq6_dest_pos = map(filter_pos(masq_dest_subnets[1]), this.cidr);
-                       zone.masq6_dest_neg = map(filter_neg(masq_dest_subnets[1]), this.cidr);
-               }
+               zone.masq6_src_subnets = subnets_group_by_masking(masq_src_subnets[1]);
+               zone.masq6_dest_subnets = subnets_group_by_masking(masq_dest_subnets[1]);
 
                zone.sflags = {};
                zone.sflags[zone.input] = true;
@@ -1875,7 +2022,7 @@ return {
                zone.dflags[zone.forward] = true;
 
                zone.match_devices = map(filter(match_devices, d => !d.invert), d => d.device);
-               zone.match_subnets = map(filter(related_subnets, s => !s.invert), this.cidr);
+               zone.match_subnets = map(filter(related_subnets, s => !s.invert && s.bits != -1), this.cidr);
 
                zone.related_subnets = related_subnets;
 
@@ -1960,9 +2107,9 @@ return {
                        let f1 = fwd.src.zone ? fwd.src.zone.family : 0;
                        let f2 = fwd.dest.zone ? fwd.dest.zone.family : 0;
 
-                       if (f1 != 0 && f2 != 0 && f1 != f2) {
+                       if (f1 && f2 && f1 != f2) {
                                this.warn_section(data,
-                                       sprintf("references src %s restricted to %s and dest restricted to %s, ignoring forwarding",
+                                       sprintf("references src %s restricted to %s and dest %s restricted to %s, ignoring forwarding",
                                                fwd.src.zone.name, this.nfproto(f1, true),
                                                fwd.dest.zone.name, this.nfproto(f2, true)));
 
@@ -2093,12 +2240,14 @@ return {
 
                                family: family,
                                proto: proto,
-                               has_addrs: !!(length(saddrs) || length(daddrs)),
+                               has_addrs: !!(saddrs[0] || saddrs[1] || saddrs[2] || daddrs[0] || daddrs[1] || daddrs[2]),
                                has_ports: !!(length(sports) || length(dports)),
-                               saddrs_pos: map(filter_pos(saddrs), this.cidr),
-                               saddrs_neg: map(filter_neg(saddrs), this.cidr),
-                               daddrs_pos: map(filter_pos(daddrs), this.cidr),
-                               daddrs_neg: map(filter_neg(daddrs), this.cidr),
+                               saddrs_pos: map(saddrs[0], this.cidr),
+                               saddrs_neg: map(saddrs[1], this.cidr),
+                               saddrs_masked: saddrs[2],
+                               daddrs_pos: map(daddrs[0], this.cidr),
+                               daddrs_neg: map(daddrs[1], this.cidr),
+                               daddrs_masked: daddrs[2],
                                sports_pos: map(filter_pos(sports), this.port),
                                sports_neg: map(filter_neg(sports), this.port),
                                dports_pos: map(filter_pos(dports), this.port),
@@ -2246,7 +2395,7 @@ return {
 
                        /* check if there's no AF specific bits, in this case we can do an AF agnostic rule */
                        if (!family && rule.target != "dscp" && !has_ipv4_specifics && !has_ipv6_specifics) {
-                               add_rule(0, proto, null, null, sports, dports, null, null, null, rule);
+                               add_rule(0, proto, [], [], sports, dports, null, null, null, rule);
                        }
 
                        /* we need to emit one or two AF specific rules */
@@ -2255,22 +2404,30 @@ return {
                                        let icmp_types = filter(itypes4, i => (i.code_min == 0 && i.code_max == 0xFF));
                                        let icmp_codes = filter(itypes4, i => (i.code_min != 0 || i.code_max != 0xFF));
 
-                                       if (length(icmp_types) || (!length(icmp_types) && !length(icmp_codes)))
-                                               add_rule(4, proto, sip[0], dip[0], sports, dports, icmp_types, null, ipset, rule);
+                                       for (let saddrs in subnets_group_by_masking(sip[0])) {
+                                               for (let daddrs in subnets_group_by_masking(dip[0])) {
+                                                       if (length(icmp_types) || (!length(icmp_types) && !length(icmp_codes)))
+                                                               add_rule(4, proto, saddrs, daddrs, sports, dports, icmp_types, null, ipset, rule);
 
-                                       if (length(icmp_codes))
-                                               add_rule(4, proto, sip[0], dip[0], sports, dports, null, icmp_codes, ipset, rule);
+                                                       if (length(icmp_codes))
+                                                               add_rule(4, proto, saddrs, daddrs, sports, dports, null, icmp_codes, ipset, rule);
+                                               }
+                                       }
                                }
 
                                if (family == 0 || family == 6) {
                                        let icmp_types = filter(itypes6, i => (i.code_min == 0 && i.code_max == 0xFF));
                                        let icmp_codes = filter(itypes6, i => (i.code_min != 0 || i.code_max != 0xFF));
 
-                                       if (length(icmp_types) || (!length(icmp_types) && !length(icmp_codes)))
-                                               add_rule(6, proto, sip[1], dip[1], sports, dports, icmp_types, null, ipset, rule);
+                                       for (let saddrs in subnets_group_by_masking(sip[1])) {
+                                               for (let daddrs in subnets_group_by_masking(dip[1])) {
+                                                       if (length(icmp_types) || (!length(icmp_types) && !length(icmp_codes)))
+                                                               add_rule(6, proto, saddrs, daddrs, sports, dports, icmp_types, null, ipset, rule);
 
-                                       if (length(icmp_codes))
-                                               add_rule(6, proto, sip[1], dip[1], sports, dports, null, icmp_codes, ipset, rule);
+                                                       if (length(icmp_codes))
+                                                               add_rule(6, proto, saddrs, daddrs, sports, dports, null, icmp_codes, ipset, rule);
+                                               }
+                                       }
                                }
                        }
                }
@@ -2282,7 +2439,7 @@ return {
 
                        name: [ "string", this.section_id(data[".name"]) ],
                        _name: [ "string", null, DEPRECATED ],
-                       family: [ "family", "4" ],
+                       family: [ "family" ],
 
                        src: [ "zone_ref" ],
                        dest: [ "zone_ref" ],
@@ -2359,22 +2516,24 @@ return {
 
                let resolve_dest = (redir) => {
                        for (let zone in this.state.zones) {
-                               for (let addr in zone.related_subnets) {
-                                       if (redir.dest_ip.family != addr.family)
-                                               continue;
+                               for (let zone_addr in zone.related_subnets) {
+                                       for (let dest_addr in redir.dest_ip.addrs) {
+                                               if (dest_addr.family != zone_addr.family)
+                                                       continue;
 
-                                       let a = apply_mask(redir.dest_ip.addr, addr.bits);
-                                       let b = apply_mask(addr.addr, addr.bits);
+                                               let a = apply_mask(dest_addr.addr, zone_addr.mask);
+                                               let b = apply_mask(zone_addr.addr, zone_addr.mask);
 
-                                       if (a != b)
-                                               continue;
+                                               if (a != b)
+                                                       continue;
 
-                                       redir.dest = {
-                                               any: false,
-                                               zone: zone
-                                       };
+                                               redir.dest = {
+                                                       any: false,
+                                                       zone: zone
+                                               };
 
-                                       return true;
+                                               return true;
+                                       }
                                }
                        }
 
@@ -2383,14 +2542,16 @@ return {
 
                if (redir.target == "dnat") {
                        if (!redir.src)
-                               return this.warn_section(r, "has no source specified");
+                               return this.warn_section(data, "has no source specified");
                        else if (redir.src.any)
-                               return this.warn_section(r, "must not have source '*' for dnat target");
+                               return this.warn_section(data, "must not have source '*' for dnat target");
                        else if (redir.dest_ip && redir.dest_ip.invert)
-                               return this.warn_section(r, "must not specify a negated 'dest_ip' value");
+                               return this.warn_section(data, "must not specify a negated 'dest_ip' value");
+                       else if (redir.dest_ip && length(filter(redir.dest_ip.addrs, a => a.bits == -1)))
+                               return this.warn_section(data, "must not use non-contiguous masks in 'dest_ip'");
 
                        if (!redir.dest && redir.dest_ip && resolve_dest(redir))
-                               this.warn_section(r, "does not specify a destination, assuming '" + redir.dest.zone.name + "'");
+                               this.warn_section(data, "does not specify a destination, assuming '" + redir.dest.zone.name + "'");
 
                        if (!redir.dest_port)
                                redir.dest_port = redir.src_dport;
@@ -2415,6 +2576,8 @@ return {
                                return this.warn_section(data, "has no 'src_dip' option specified");
                        else if (redir.src_dip.invert)
                                return this.warn_section(data, "must not specify a negated 'src_dip' value");
+                       else if (length(filter(redir.src_dip.addrs, a => a.bits == -1)))
+                               return this.warn_section(data, "must not use non-contiguous masks in 'src_dip'");
                        else if (redir.src_mac)
                                return this.warn_section(data, "must not use 'src_mac' option for snat target");
                        else if (redir.helper)
@@ -2430,12 +2593,14 @@ return {
 
                                family: family,
                                proto: proto,
-                               has_addrs: !!(length(saddrs) || length(daddrs)),
+                               has_addrs: !!(saddrs[0] || saddrs[1] || saddrs[2] || daddrs[0] || daddrs[1] || daddrs[2]),
                                has_ports: !!(sport || dport || rport),
-                               saddrs_pos: map(filter_pos(saddrs), this.cidr),
-                               saddrs_neg: map(filter_neg(saddrs), this.cidr),
-                               daddrs_pos: map(filter_pos(daddrs), this.cidr),
-                               daddrs_neg: map(filter_neg(daddrs), this.cidr),
+                               saddrs_pos: map(saddrs[0], this.cidr),
+                               saddrs_neg: map(saddrs[1], this.cidr),
+                               saddrs_masked: saddrs[2],
+                               daddrs_pos: map(daddrs[0], this.cidr),
+                               daddrs_neg: map(daddrs[1], this.cidr),
+                               daddrs_masked: daddrs[2],
                                sports_pos: map(filter_pos(to_array(sport)), this.port),
                                sports_neg: map(filter_neg(to_array(sport)), this.port),
                                dports_pos: map(filter_pos(to_array(dport)), this.port),
@@ -2459,6 +2624,7 @@ return {
                        switch (r.target) {
                        case "dnat":
                                r.chain = sprintf("dstnat_%s", r.src.zone.name);
+                               r.src.zone.dflags.dnat = true;
 
                                if (!r.raddr)
                                        r.target = "redirect";
@@ -2467,6 +2633,7 @@ return {
 
                        case "snat":
                                r.chain = sprintf("srcnat_%s", r.dest.zone.name);
+                               r.dest.zone.dflags.snat = true;
                                break;
                        }
 
@@ -2519,10 +2686,7 @@ return {
                                }
 
                                /* build reflection rules */
-                               if (redir.reflection && (length(rip[0]) || length(rip[1])) &&
-                                   redir.src && redir.src.zone && redir.src.zone[family == 4 ? "masq" : "masq6"] &&
-                                   redir.dest && redir.dest.zone) {
-
+                               if (redir.reflection && (length(rip[0]) || length(rip[1])) && redir.src?.zone && redir.dest?.zone) {
                                        let refredir = {
                                                name: redir.name + " (reflection)",
 
@@ -2543,7 +2707,7 @@ return {
                                                mark: redir.mark
                                        };
 
-                                       let eaddrs = subnets_split_af(length(dip) ? dip : { addrs: redir.src.zone.related_subnets });
+                                       let eaddrs = length(dip) ? dip : subnets_split_af({ addrs: map(redir.src.zone.related_subnets, to_hostaddr) });
                                        let rzones = length(redir.reflection_zone) ? redir.reflection_zone : [ redir.dest ];
 
                                        for (let rzone in rzones) {
@@ -2557,28 +2721,46 @@ return {
                                                let iaddrs = subnets_split_af({ addrs: rzone.zone.related_subnets });
                                                let refaddrs = (redir.reflection_src == "internal") ? iaddrs : eaddrs;
 
-                                               refaddrs = [
-                                                       map(refaddrs[0], to_hostaddr),
-                                                       map(refaddrs[1], to_hostaddr)
-                                               ];
+                                               for (let i = 0; i <= 1; i++) {
+                                                       if (redir.src.zone[i ? "masq6" : "masq"] && length(rip[i])) {
+                                                               let snat_addr = refaddrs[i]?.[0];
+
+                                                               /* For internal reflection sources try to find a suitable candiate IP
+                                                                * among the reflection zone subnets which is within the same subnet
+                                                                * as the original DNAT destination. If we can't find any matching
+                                                                * one then simply take the first candidate. */
+                                                               if (redir.reflection_src == "internal") {
+                                                                       for (let zone_addr in rzone.zone.related_subnets) {
+                                                                               if (zone_addr.family != rip[i][0].family)
+                                                                                       continue;
+
+                                                                               let r = apply_mask(rip[i][0].addr, zone_addr.mask);
+                                                                               let a = apply_mask(zone_addr.addr, zone_addr.mask);
+
+                                                                               if (r != a)
+                                                                                       continue;
+
+                                                                               snat_addr = zone_addr;
+                                                                               break;
+                                                                       }
+                                                               }
 
-                                               eaddrs = [
-                                                       map(eaddrs[0], to_hostaddr),
-                                                       map(eaddrs[1], to_hostaddr)
-                                               ];
+                                                               if (snat_addr) {
+                                                                       refredir.src = rzone;
+                                                                       refredir.dest = null;
+                                                                       refredir.target = "dnat";
 
-                                               for (let i = 0; i <= 1; i++) {
-                                                       if (length(rip[i])) {
-                                                               refredir.src = rzone;
-                                                               refredir.dest = null;
-                                                               refredir.target = "dnat";
-                                                               add_rule(i ? 6 : 4, proto, iaddrs[i], eaddrs[i], rip[i], sport, dport, rport, null, refredir);
+                                                                       for (let saddrs in subnets_group_by_masking(iaddrs[i]))
+                                                                               for (let daddrs in subnets_group_by_masking(eaddrs[i]))
+                                                                                       add_rule(i ? 6 : 4, proto, saddrs, daddrs, rip[i], sport, dport, rport, null, refredir);
 
-                                                               for (let refaddr in refaddrs[i]) {
                                                                        refredir.src = null;
                                                                        refredir.dest = rzone;
                                                                        refredir.target = "snat";
-                                                                       add_rule(i ? 6 : 4, proto, iaddrs[i], rip[i], [ refaddr ], null, rport, null, null, refredir);
+
+                                                                       for (let daddrs in subnets_group_by_masking(rip[i]))
+                                                                               for (let saddrs in subnets_group_by_masking(iaddrs[i]))
+                                                                                       add_rule(i ? 6 : 4, proto, saddrs, daddrs, [ to_hostaddr(snat_addr) ], null, rport, null, null, refredir);
                                                                }
                                                        }
                                                }
@@ -2610,16 +2792,26 @@ return {
 
                        /* check if there's no AF specific bits, in this case we can do an AF agnostic rule */
                        if (!family && !length(sip[0]) && !length(sip[1]) && !length(dip[0]) && !length(dip[1]) && !length(rip[0]) && !length(rip[1])) {
-                               add_rule(0, proto, null, null, null, sport, dport, rport, null, redir);
+                               /* for backwards compatibility, treat unspecified family as IPv4 unless user explicitly requested any (0) */
+                               if (family == null)
+                                       family = 4;
+
+                               add_rule(family, proto, [], [], null, sport, dport, rport, null, redir);
                        }
 
                        /* we need to emit one or two AF specific rules */
                        else {
-                               if (family == 0 || family == 4)
-                                       add_rule(4, proto, sip[0], dip[0], rip[0], sport, dport, rport, ipset, redir);
+                               if ((!family || family == 4) && (length(sip[0]) || length(dip[0]) || length(rip[0]))) {
+                                       for (let saddrs in subnets_group_by_masking(sip[0]))
+                                               for (let daddrs in subnets_group_by_masking(dip[0]))
+                                                       add_rule(4, proto, saddrs, daddrs, rip[0], sport, dport, rport, ipset, redir);
+                               }
 
-                               if (family == 0 || family == 6)
-                                       add_rule(6, proto, sip[1], dip[1], rip[1], sport, dport, rport, ipset, redir);
+                               if ((!family || family == 6) && (length(sip[1]) || length(dip[1]) || length(rip[1]))) {
+                                       for (let saddrs in subnets_group_by_masking(sip[1]))
+                                               for (let daddrs in subnets_group_by_masking(dip[1]))
+                                                       add_rule(6, proto, saddrs, daddrs, rip[1], sport, dport, rport, ipset, redir);
+                               }
                        }
                }
        },
@@ -2699,6 +2891,11 @@ return {
                        return;
                }
 
+               if (snat.snat_ip && length(filter(snat.snat_ip.addrs, a => a.bits == -1 || a.invert))) {
+                       this.warn_section(data, "must not use inversion or non-contiguous masks in 'snat_ip', ignoring section");
+                       return;
+               }
+
                if (snat.src && snat.src.zone)
                        snat.src.zone.dflags.snat = true;
 
@@ -2708,12 +2905,14 @@ return {
 
                                family: family,
                                proto: proto,
-                               has_addrs: !!(length(saddrs) || length(daddrs) || length(raddrs)),
+                               has_addrs: !!(saddrs[0] || saddrs[1] || saddrs[2] || daddrs[0] || daddrs[1] || daddrs[2]),
                                has_ports: !!(sport || dport),
-                               saddrs_pos: map(filter_pos(saddrs), this.cidr),
-                               saddrs_neg: map(filter_neg(saddrs), this.cidr),
-                               daddrs_pos: map(filter_pos(daddrs), this.cidr),
-                               daddrs_neg: map(filter_neg(daddrs), this.cidr),
+                               saddrs_pos: map(saddrs[0], this.cidr),
+                               saddrs_neg: map(saddrs[1], this.cidr),
+                               saddrs_masked: saddrs[2],
+                               daddrs_pos: map(daddrs[0], this.cidr),
+                               daddrs_neg: map(daddrs[1], this.cidr),
+                               daddrs_masked: daddrs[2],
                                sports_pos: map(filter_pos(to_array(sport)), this.port),
                                sports_neg: map(filter_neg(to_array(sport)), this.port),
                                dports_pos: map(filter_pos(to_array(dport)), this.port),
@@ -2774,16 +2973,20 @@ return {
 
                        /* check if there's no AF specific bits, in this case we can do an AF agnostic rule */
                        if (!family && !length(sip[0]) && !length(sip[1]) && !length(dip[0]) && !length(dip[1]) && !length(rip[0]) && !length(rip[1])) {
-                               add_rule(0, proto, null, null, null, sport, dport, rport, snat);
+                               add_rule(0, proto, [], [], null, sport, dport, rport, snat);
                        }
 
                        /* we need to emit one or two AF specific rules */
                        else {
                                if (family == 0 || family == 4)
-                                       add_rule(4, proto, sip[0], dip[0], rip[0], sport, dport, rport, snat);
+                                       for (let saddr in subnets_group_by_masking(sip[0]))
+                                               for (let daddr in subnets_group_by_masking(dip[0]))
+                                                       add_rule(4, proto, saddr, daddr, rip[0], sport, dport, rport, snat);
 
                                if (family == 0 || family == 6)
-                                       add_rule(6, proto, sip[1], dip[1], rip[1], sport, dport, rport, snat);
+                                       for (let saddr in subnets_group_by_masking(sip[1]))
+                                               for (let daddr in subnets_group_by_masking(dip[1]))
+                                                       add_rule(6, proto, saddr, daddr, rip[1], sport, dport, rport, snat);
                        }
                }
        },