mirror of
https://github.com/logicog/RTLPlayground.git
synced 2026-08-30 14:52:51 +08:00
Persist port speed settings in config parser
parseConf() only recognized "port N name" in conf_cmds, so "port N <speed>" lines were treated as unknown commands and dropped on save - configured port speeds never persisted. Add the speed command (incl. optional half/full duplex suffix) to conf_cmds, add a "port N" entry to conf_overwrite so re-saving a speed replaces the previous value, and guard the per-port name entry so changing a port's speed no longer wipes its configured name.
This commit is contained in:
+3
-1
@@ -14,6 +14,7 @@ const conf_cmds = [
|
|||||||
/^pvid\s+\d{1,2}\s+\d{1,4}$/,
|
/^pvid\s+\d{1,2}\s+\d{1,4}$/,
|
||||||
/^ingress(\s+\d{1,2}[tua])+$/,
|
/^ingress(\s+\d{1,2}[tua])+$/,
|
||||||
/^ingress\s+[tua]$/,
|
/^ingress\s+[tua]$/,
|
||||||
|
/^port\s+\d{1,2}\s+(10m|100m|1g|2g5|5g|10g|auto|on|off)(\s+(half|full))?$/,
|
||||||
/^port\s+\d{1,2}\s+name\s+\S+$/,
|
/^port\s+\d{1,2}\s+name\s+\S+$/,
|
||||||
/^eee(\s+\d{1,2})?\s+(on|off)$/,
|
/^eee(\s+\d{1,2})?\s+(on|off)$/,
|
||||||
/^mirror(\s+\d{1,2})(\s+\d{1,2}[tr]?)+$/,
|
/^mirror(\s+\d{1,2})(\s+\d{1,2}[tr]?)+$/,
|
||||||
@@ -36,6 +37,7 @@ const conf_overwrite = [
|
|||||||
/^vlan\s+\d{1,4}(?!\s+mgmt\b)/,
|
/^vlan\s+\d{1,4}(?!\s+mgmt\b)/,
|
||||||
/^pvid\s+\d{1,2}\b/,
|
/^pvid\s+\d{1,2}\b/,
|
||||||
/^ingress\b/,
|
/^ingress\b/,
|
||||||
|
/^port\s+\d{1,2}(?!\s+name\b)/,
|
||||||
/^port\s+\d{1,2}\s+name\b/,
|
/^port\s+\d{1,2}\s+name\b/,
|
||||||
/^eee\s+\d{1,2}\b/,
|
/^eee\s+\d{1,2}\b/,
|
||||||
/^eee\b/,
|
/^eee\b/,
|
||||||
@@ -71,7 +73,7 @@ function parseConf(s){
|
|||||||
let m = line.match(x);
|
let m = line.match(x);
|
||||||
let matchStr = m[0];
|
let matchStr = m[0];
|
||||||
configuration = configuration.filter(item =>
|
configuration = configuration.filter(item =>
|
||||||
!(item === matchStr || (item.startsWith(matchStr + " ") && !item.endsWith(" mgmt"))));
|
!(item === matchStr || (item.startsWith(matchStr + " ") && !item.endsWith(" mgmt") && !item.startsWith(matchStr + " name "))));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user