luci-proto-vxlan: fix tos write and load handlers

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit 1de73e16f525a5edc80954afda50db88b3cf96da)

diff --git a/protocols/luci-proto-vxlan/htdocs/luci-static/resources/protocol/vxlan.js b/protocols/luci-proto-vxlan/htdocs/luci-static/resources/protocol/vxlan.js
index 3997bc6277854261622e24562a20143ec357c382..358f1da2cb78ff5a3edf25c45abc014ec49a7cc4 100644 (file)
--- a/protocols/luci-proto-vxlan/htdocs/luci-static/resources/protocol/vxlan.js
+++ b/protocols/luci-proto-vxlan/htdocs/luci-static/resources/protocol/vxlan.js
@@ -157,10 +157,13 @@ return network.registerProtocol('vxlan', {
                        return false;
                };
                o.write = function(section_id, value) {
-                       return uci.set('network', section_id, 'tos', parseInt(value).toString(16).padStart(2, '0'));
+                       if (!value) return
+                       value = value === 'inherit' ? value : parseInt(value).toString(16).padStart(2, '0');
+                       return uci.set('network', section_id, 'tos', value);
                };
                o.load = function(section_id) {
-                       return parseInt(uci.get('network', section_id, 'tos'), 16).toString();
+                       const value = uci.get('network', section_id, 'tos');
+                       return value ? (value === 'inherit' ? value : parseInt(value, 16).toString()) : null;
                };
 
                o = s.taboption('advanced', form.Flag, 'rxcsum', _('Enable rx checksum'));

diff --git a/protocols/luci-proto-vxlan/htdocs/luci-static/resources/protocol/vxlan6.js b/protocols/luci-proto-vxlan/htdocs/luci-static/resources/protocol/vxlan6.js
index 9f54d4c1b8234f1999c9202d7351d571bb21b9cf..3bf6a50c6ac511d40eff5509cfb98f163dbb0c01 100644 (file)
--- a/protocols/luci-proto-vxlan/htdocs/luci-static/resources/protocol/vxlan6.js
+++ b/protocols/luci-proto-vxlan/htdocs/luci-static/resources/protocol/vxlan6.js
@@ -157,10 +157,13 @@ return network.registerProtocol('vxlan6', {
                        return false;
                };
                o.write = function(section_id, value) {
-                       return uci.set('network', section_id, 'tos', parseInt(value).toString(16).padStart(2, '0'));
+                       if (!value) return
+                       value = value === 'inherit' ? value : parseInt(value).toString(16).padStart(2, '0');
+                       return uci.set('network', section_id, 'tos', value);
                };
                o.load = function(section_id) {
-                       return parseInt(uci.get('network', section_id, 'tos'), 16).toString();
+                       const value = uci.get('network', section_id, 'tos');
+                       return value ? (value === 'inherit' ? value : parseInt(value, 16).toString()) : null;
                };
 
                o = s.taboption('advanced', form.Flag, 'rxcsum', _('Enable rx checksum'));