From 73d9a8ccb1c9290ab31abf9b7c3416df6c3eed1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20van=20Dorst?= Date: Mon, 31 Aug 2026 23:01:22 +0200 Subject: [PATCH 1/3] Fix VLAN command documentation. 'u'-suffix is not accepted anymore. --- cmd_parser.c | 2 +- doc/vlan.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd_parser.c b/cmd_parser.c index 66b05bde..dc56b8b1 100644 --- a/cmd_parser.c +++ b/cmd_parser.c @@ -541,7 +541,7 @@ void parse_vlan(void) } return; err: - print_string("Error: vlan (|show) [port][t/u]...\n"); + print_string("Error: vlan (|show) [port][t]...\n"); } diff --git a/doc/vlan.md b/doc/vlan.md index a3d50c74..907f94be 100644 --- a/doc/vlan.md +++ b/doc/vlan.md @@ -69,9 +69,9 @@ void vlan_delete(uint16_t vlan) __banked; # VLAN configuration on the Serial Console For testing the following commands are provided on the serial console: ``` -vlan p[t/u]... - create or set vlan with given ID and the list of ports as members, a t - behind a port defines the port as a tagged member, the u is optional +vlan p[t]... + create or set vlan with given ID and the list of ports as members, a `t` + behind a port defines the port as a tagged member. vlan d deletes the VLAN From 373a21f4a14cec7a75ea575dd745e3ae8df29c5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20van=20Dorst?= Date: Tue, 1 Sep 2026 19:02:22 +0200 Subject: [PATCH 2/3] Add CHANGELOG.md and vlan command breaking change. --- CHANGELOG.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..f0c5813a --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,20 @@ +# Change Log + +## [0.x] - 2026-xx-XX + +## Added + +## Changed + +## Fixed + +## Breaking changes + +- Config + - VLAN don't accept port `u`-suffix anymore. + So `vlan 1 4u` is not valid anymore. + Replace it with `vlan 1 4`. + +## [v0.1_aplha] - 2025-11-03 + +First release. \ No newline at end of file From 6b39bcc4487e2f76a38a78a3654f454ebb29b3bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20van=20Dorst?= Date: Wed, 2 Sep 2026 19:42:51 +0200 Subject: [PATCH 3/3] JS: vlan don't accept `u`-suffic anymore. Als update CHANGELOG about CPU_PORT --- CHANGELOG.md | 5 +++++ html/config.js | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f0c5813a..168bd34f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,11 @@ - VLAN don't accept port `u`-suffix anymore. So `vlan 1 4u` is not valid anymore. Replace it with `vlan 1 4`. +- Commands + - port zero/`0` is treated as the `CPU_PORT`. #326 + - Many commands don't accept the CPU_PORT anymore. See #334. + When the CPU_PORT is needed, the command/service will add the CPU_PORT automaticly. + Only `isolate` accept the CPU_PORT as destination port. ## [v0.1_aplha] - 2025-11-03 diff --git a/html/config.js b/html/config.js index 8af3fbaa..a5e6b14f 100644 --- a/html/config.js +++ b/html/config.js @@ -10,7 +10,7 @@ const conf_cmds = [ /^passwd\s+\S+$/, /^vlan\s+\d{1,4}\s+d$/, /^vlan\s+\d{1,4}\s+mgmt$/, - /^vlan\s+\d{1,4}(\s+[a-zA-Z]\w*)?(\s+\d{1,2}[tu]?)+$/, + /^vlan\s+\d{1,4}(\s+[a-zA-Z]\w*)?(\s+[1-9]t?)+$/, /^pvid\s+\d{1,2}\s+\d{1,4}$/, /^ingress(\s+\d{1,2}[tua])+$/, /^ingress\s+[tua]$/,