OSDN Git Service

luci-mod-status: nftables.js: align flow expr workaround with upstream
authorJo-Philipp Wich <jo@mein.io>
Thu, 10 Feb 2022 19:52:34 +0000 (20:52 +0100)
committerJo-Philipp Wich <jo@mein.io>
Thu, 10 Feb 2022 19:52:34 +0000 (20:52 +0100)
Ref: https://git.netfilter.org/nftables/commit/?id=160d44c91113849b9c09f6bbad159e10ded1ca54
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
modules/luci-mod-status/htdocs/luci-static/resources/view/status/nftables.js

index 6725d8c..0a22a33 100644 (file)
@@ -421,7 +421,7 @@ return view.extend({
                case 'flow':
                        return E('span', {
                                'class': 'ifacebadge'
-                       }, action_translations.flow.format(spec.add));
+                       }, action_translations.flow.format(spec.flowtable.replace(/^@/, '')));
 
                default:
                        return E('span', {
@@ -460,8 +460,8 @@ return view.extend({
                if (Array.isArray(spec.expr)) {
                        for (var i = 0; i < spec.expr.length; i++) {
                                // nftables JSON format bug, `flow` targets are currently not properly serialized
-                               if (typeof(spec.expr[i]) == 'string' && spec.expr[i].match(/^flow add @(\S+)$/))
-                                       spec.expr[i] = { flow: { add: RegExp.$1 } };
+                               if (typeof(spec.expr[i]) == 'string' && spec.expr[i].match(/^flow add (@\S+)$/))
+                                       spec.expr[i] = { flow: { op: "add", flowtable: RegExp.$1 } };
 
                                var res = this.renderExpr(spec.expr[i], spec.table);