mirror of
https://github.com/logicog/RTLPlayground.git
synced 2026-08-30 14:52:51 +08:00
httpd: move the management VLAN into /vlanlist
Review feedback on #306. The value used to ride in /information.json and the picker fetched /vlanlist separately, so the page needed both requests to mean anything. /vlanlist now answers {"mgmt":N,"vlan":[...]} and the picker reads both from the one response. Both consumers in vlan.js were taught the new shape, and /information.json no longer carries mgmt_vlan. The truncation guard now reserves 141 bytes instead of 139: the closing grew to two bytes with the wrapping object, and the comma in front of a non-first entry was never counted, so the worst case could land one byte past outbuf even before this change. char_to_html() does not check. The comments added on this branch are gone as well, style.css and system.js both, since these files are served byte for byte. page_impl.rel stays at DSEG 5, OSEG 0, BSEG 3 and the image reports the same 10183 bytes of XDATA before and after.
This commit is contained in:
@@ -82,7 +82,6 @@ object, img {
|
||||
.isNOK{ color: #900;}
|
||||
.isOK{ color: #090;}
|
||||
.ip{padding:8px 16px;margin-bottom: 1em;margin-left: 1em}
|
||||
/* read-only values line up with the text inside the input fields */
|
||||
.rotext{display:inline-block;padding:8px 16px;margin-bottom: 1em;margin-left: 1em}
|
||||
.row {display: flex;}
|
||||
.rcol {flex: 90%;}
|
||||
|
||||
+6
-7
@@ -133,7 +133,7 @@ function fetchIP() {
|
||||
document.getElementById("gw").value=s.ip_gateway;
|
||||
document.getElementById("hostname").value=s.hostname;
|
||||
document.getElementById("model").textContent=s.hw_ver;
|
||||
loadMgmtVlan(parseInt(s.mgmt_vlan, 10) || 0);
|
||||
loadMgmtVlan();
|
||||
clearInterval(systemInterval);
|
||||
// Fetch and populate the config textbox
|
||||
fetchConfig().then((configText) => {
|
||||
@@ -170,14 +170,13 @@ window.addEventListener("load", function() {
|
||||
|
||||
var mgmtVlanCurrent = 0;
|
||||
|
||||
/* Populate the management-VLAN picker from the configured VLANs. If management
|
||||
* is untagged there is no VLAN to select, so show that as a disabled entry
|
||||
* rather than inventing an id the switch would reject. */
|
||||
function loadMgmtVlan(cur) {
|
||||
function loadMgmtVlan() {
|
||||
var sel = document.getElementById('mgmtvlan');
|
||||
if (!sel) return;
|
||||
mgmtVlanCurrent = cur;
|
||||
fetch('/vlanlist').then(function(r) { return r.json(); }).then(function(list) {
|
||||
fetch('/vlanlist').then(function(r) { return r.json(); }).then(function(d) {
|
||||
var cur = d.mgmt || 0;
|
||||
var list = d.vlan || [];
|
||||
mgmtVlanCurrent = cur;
|
||||
sel.innerHTML = '';
|
||||
if (!cur) {
|
||||
var none = document.createElement('option');
|
||||
|
||||
+2
-2
@@ -110,7 +110,7 @@ async function loadVlanTable() {
|
||||
var resp;
|
||||
try { resp = await fetch('/vlanlist'); } catch(e) { return; }
|
||||
if (!resp.ok) return;
|
||||
var vlans = await resp.json();
|
||||
var vlans = (await resp.json()).vlan || [];
|
||||
for (var i = 0; i < vlans.length; i++) {
|
||||
var v = vlans[i];
|
||||
var vresp;
|
||||
@@ -181,7 +181,7 @@ function loadVlanList() {
|
||||
sel.style.display = 'none';
|
||||
return;
|
||||
}
|
||||
var vlans = JSON.parse(this.responseText);
|
||||
var vlans = JSON.parse(this.responseText).vlan || [];
|
||||
if (!vlans.length) {
|
||||
sel.style.display = 'none';
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user