ChaCha20 implementation for encryption

Add an implementation in 8051 assembler for the generation of a ChaCha20 keystream and an encryption function using the keystream in C. A test function using the example from RFC7539 is provided in chacha20_test. Keys, nonce, and block counter and the pointers to the input plaintext, its length and the output pointer are provided via a struct chacha20, which also holds the working state of the ChaCha20 algorithm
2026-09-02 15:02:51 +08:00 · 2026-04-26 10:30:55 +02:00
144 changed files with 2118 additions and 7773 deletions
@@ -1,19 +0,0 @@
 .git/
 .gitignore
 .gitattributes
 .github/
 output/
 installer/output/
 *.bin
 html_data.c
 html_data.h
 *.o
 *.rel
 *.lst
 *.sym
 *.asm
 *.ihx
 *.img
 *.map
 *.mem
 *.lk
@@ -1,19 +0,0 @@
 FROM debian:13-slim
 RUN apt-get update && apt-get install -y \
    make \
    gcc \
    sdcc \
    xxd \
    python3 \
    libjson-c-dev \
    golang-go \
    git \
    && rm -rf /var/lib/apt/lists/*
 # git safe.directory for mounted repos (Makefile uses git describe)
 RUN git config --global --add safe.directory /workspace
 WORKDIR /workspace
 CMD ["bash"]
@@ -4,149 +4,89 @@ DEFAULT_CONFIG_LOCATION = 454656
 CONFIG_LOCATION = 458752
 HTML_LOCATION = 262144
 ifeq ($(origin CC),default)
 CC = sdcc
 endif
 CC_FLAGS = -mmcs51 -I. -Ihttpd -Iuip
-ASM ?= sdas8051
+ASM = sdas8051
 AFLAGS= -plosgff
 SUBDIRS := tools
 SUBDIRSCLEAN=$(addsuffix clean,$(SUBDIRS))
 BUILDDIR = output
 VERSION_HEADER := version.h
 ifeq ($(MACHINE),)
 	MACHINE:= $(shell grep "^\s*#define MACHINE_" machine.h | sed "s/^\s*#define MACHINE_//")
 else
 	CC_FLAGS += -DMACHINE_$(MACHINE)
 endif
-BUILDDIR = output/$(MACHINE)
+all: create_build_dir $(VERSION_HEADER) $(SUBDIRS) $(BUILDDIR)/rtlplayground.bin
 VERSION_HEADER := version.h
 GIT_VERSION := $(shell git rev-parse --short HEAD)
 ifeq ($(shell git status --porcelain --untracked-files=no),)
 else
 	GIT_VERSION := $(GIT_VERSION)-dirty
 endif
 VERSION_EXTENSION = v$(VERSION)-$(GIT_VERSION)
 FILENAME_EXTENSION = $(VERSION_EXTENSION)-$(MACHINE)
 # Deterministic build date: honor SOURCE_DATE_EPOCH, else the HEAD commit date,
 # else wall-clock (no-git fallback). Keeps same-commit builds byte-identical
 # (BUILD_DATE is baked into the image and covered by the trailing CRC).
 SOURCE_DATE_EPOCH ?= $(shell git show -s --format=%ct HEAD 2>/dev/null)
 ifeq ($(SOURCE_DATE_EPOCH),)
 BUILD_DATE := $(shell date +"%Y-%m-%d %H:%M:%S")
 else
 BUILD_DATE := $(shell date -u -d @$(SOURCE_DATE_EPOCH) +"%Y-%m-%d %H:%M:%S" 2>/dev/null \
 	|| date -u -r $(SOURCE_DATE_EPOCH) +"%Y-%m-%d %H:%M:%S")
 endif
 all: create_build_dir $(VERSION_HEADER) $(SUBDIRS) $(BUILDDIR)/rtlplayground-$(FILENAME_EXTENSION).bin
 create_build_dir:
-	mkdir -p "$(BUILDDIR)"
+	mkdir -p $(BUILDDIR)
-	mkdir -p "$(BUILDDIR)/uip"
+	mkdir -p $(BUILDDIR)/uip
-	mkdir -p "$(BUILDDIR)/httpd"
+	mkdir -p $(BUILDDIR)/httpd
-
+	mkdir -p $(BUILDDIR)/crypto
 # Keep machine.c in first position to fail immediately on invalid $MACHINE value
 SRCS = \
 	machine.c \
 	machine_init.c \
 	cmd_editor.c \
 	cmd_parser.c \
 	dhcp.c \
 	html_data.c \
 	rtlplayground.c \
 	syslog.c \
 	udp_apps.c
 # RTL837x
 SRCS += \
 	rtl837x_bandwidth.c \
 	rtl837x_flash.c \
 	rtl837x_igmp.c \
 	rtl837x_init.c \
 	rtl837x_leds.c \
 	rtl837x_phy.c \
 	rtl837x_pins.c\
 	rtl837x_port.c \
 	rtl837x_stp.c
 SRCS += \
 	httpd/httpd.c \
 	httpd/page_impl.c
 SRCS += \
 	uip/timer.c \
 	uip/uip.c \
 	uip/uiplib.c \
 	uip/uip_arp.c \
 	uip/uip-fw.c \
 	uip/uip-neighbor.c \
 	uip/uip-split.c
 SRCS = rtlplayground.c rtl837x_flash.c rtl837x_leds.c rtl837x_phy.c rtl837x_port.c cmd_parser.c html_data.c rtl837x_igmp.c
 SRCS += rtl837x_stp.c rtl837x_pins.c dhcp.c machine.c cmd_editor.c rtl837x_bandwidth.c rtl837x_init.c
 SRCS += uip/timer.c uip/uip.c uip/uip_arp.c uip/uiplib.c uip/uip-fw.c uip/uip-neighbor.c uip/uip-split.c
 SRCS += httpd/httpd.c httpd/page_impl.c
 SRCS += crypto/chacha20.c
 OBJS = ${SRCS:%.c=$(BUILDDIR)/%.rel}
 DEPS := ${SRCS:%.c=$(BUILDDIR)/%.d}
-HTML := $(shell find html -name '*.js' -or -name '*.html' -or -name '*.svg')
+HTML := $(shell find $(html) -name '*.js' -or -name '*.html' -or -name '*.svg')
-html_data.c html_data.h &: $(HTML) | tools
+html_data.c html_data.h: $(HTML) tools/$(BUILDDIR)/fileadder
-	tools/output/fileadder -a $(HTML_LOCATION) -s $(IMAGESIZE) -b BANK1 -d html -p html_data
+	tools/$(BUILDDIR)/fileadder -a $(HTML_LOCATION) -s $(IMAGESIZE) -b BANK1 -d html -p html_data
 $(VERSION_HEADER):
-	@printf '%s\n' "#ifndef VERSION_H" "#define VERSION_H" \
+	@echo "#ifndef VERSION_H" > $(VERSION_HEADER)
-		"#define VERSION_SW \"$(VERSION_EXTENSION)\"" \
+	@echo "#define VERSION_H" >> $(VERSION_HEADER)
-		"#define BUILD_DATE \"$(BUILD_DATE)\"" \
+	@echo "#define VERSION_SW \"v$(VERSION)-g$(shell git rev-parse --short HEAD)\"" >> $(VERSION_HEADER)
-		"#endif" > $(VERSION_HEADER)
+	@echo "#define BUILD_DATE \"$(shell date +"%Y-%m-%d %H:%M:%S")\"" >> $(VERSION_HEADER)
 	@echo "#endif" >> $(VERSION_HEADER)
 httpd: html_data.h
 $(SUBDIRS):
 	$(MAKE) -C $@
-clean: $(SUBDIRSCLEAN)
+clean:
 	-rm -f html_data.c html_data.h $(VERSION_HEADER)
 	-if [ -d $(BUILDDIR) ]; then find $(BUILDDIR) -type f ! -name "*.bin" -delete; fi
 distclean: $(SUBDIRSCLEAN)
 	-rm -f html_data.c html_data.h $(VERSION_HEADER)
 	-rm -rf $(BUILDDIR)
-$(SUBDIRSCLEAN):
+$(BUILDDIR)/%.rel: %.asm
-	$(MAKE) -C $(@:clean=) clean
+	${ASM} ${AFLAGS} -o $@ $<
-$(BUILDDIR)/%.rel: %.c | create_build_dir html_data.h
+$(BUILDDIR)/%.rel: %.c
 	$(CC) -MMD $(CC_FLAGS) -o $@ -c $<
-$(BUILDDIR)/%.rel: %.asm | create_build_dir
+$(BUILDDIR)/rtlplayground.ihx: $(OBJS) $(BUILDDIR)/crtstart.rel $(BUILDDIR)/crc16.rel $(BUILDDIR)/crypto/chacha_8051.rel
 	${ASM} ${AFLAGS} -o $@ $<
 #	mv -f $(addprefix $(basename $^), .lst .rel .sym) .
 $(BUILDDIR)/rtlplayground.ihx: $(OBJS) $(BUILDDIR)/crtbank.rel $(BUILDDIR)/crc16.rel
 	$(CC) $(CC_FLAGS) -Wl-bHOME=0x00000 -Wl-bBANK1=0x14000 -Wl-bBANK2=0x24000 -Wl-r -o $@ $^
 $(BUILDDIR)/rtlplayground.img: $(BUILDDIR)/rtlplayground.ihx
 	objcopy --input-target=ihex -O binary $< $@
-$(BUILDDIR)/rtlplayground-$(FILENAME_EXTENSION).bin: $(BUILDDIR)/rtlplayground.img | tools
+$(BUILDDIR)/rtlplayground.bin: $(BUILDDIR)/rtlplayground.img
 	if [ -e $@ ]; then rm $@; fi
-	tools/output/imagebuilder -i $^ $@
+	tools/$(BUILDDIR)/imagebuilder -i $^ $@
-	tools/output/fileadder -a $(DEFAULT_CONFIG_LOCATION) -s $(IMAGESIZE) -d config.txt $@
+	tools/$(BUILDDIR)/fileadder -a $(DEFAULT_CONFIG_LOCATION) -s $(IMAGESIZE) -d config.txt $@
-	tools/output/fileadder -a $(CONFIG_LOCATION) -s $(IMAGESIZE) -d config.txt $@
+	tools/$(BUILDDIR)/fileadder -a $(CONFIG_LOCATION) -s $(IMAGESIZE) -d config.txt $@
-	tools/output/fileadder -a $(HTML_LOCATION) -s $(IMAGESIZE) -d html -p html_data -b BANK1 $@
+	tools/$(BUILDDIR)/fileadder -a $(HTML_LOCATION) -s $(IMAGESIZE) -d html -p html_data -b BANK1 $@
-	tools/output/crc_calculator -u $@
+	tools/$(BUILDDIR)/crc_calculator -u $@
 	ln -sf $(MACHINE)/rtlplayground-$(FILENAME_EXTENSION).bin output/rtlplayground.bin
-.PHONY: clean distclean all $(SUBDIRS) $(SUBDIRSCLEAN) $(VERSION_HEADER) create_build_dir
+
 .PHONY: clean all $(SUBDIRS) $(VERSION_HEADER)
 .PHONY:
 machine_check:
 	@mkdir -p $(BUILDDIR)/tmp
 	@set -eo pipefail; \
-	for MACHINE in `grep -E '^[[:space:]]*(//[[:space:]]*)?#define MACHINE_' machine.h | sed -E 's%^[[:space:]]*(//[[:space:]]*)?#define MACHINE_%%' | awk '{print $$1}' | sort -u`; \
+	for MACHINE in `grep -e ' MACHINE_' machine.c | sed -e 's%^.* MACHINE_%%' -e 's%[ ]*//.*$$%%' | sort -u`; \
 	do \
 	echo "Checking $${MACHINE}"; \
 	$(CC) $(CC_FLAGS) -DMACHINE_$${MACHINE} -MMD -o $(BUILDDIR)/tmp/machine_check -c machine.c; \
 	$(CC) $(CC_FLAGS) -DMACHINE_$${MACHINE} -MMD -o $(BUILDDIR)/tmp/machine_check -c machine_init.c; \
 	done
 	@rm -rf $(BUILDDIR)/tmp
@@ -28,10 +28,8 @@ only the following features are provided:
 <img width="1420" height="623" alt="GUI" src="doc/images/gui.png" />
 While the firmware provides already considerable improvements over the original managed firmware,
-the firmware still lacks support for the proprietary loop prevention
+the firmware still lacks support for STP and the proprietary loop prevention
-protocols as well as DHCP. Spanning Tree is available (see doc/stp.md), but is
+protocols as well as DHCP. If you need these features, do not install the playground on your managed
 a simplified implementation - read that document before enabling it on a
 switch you administer over the network. If you need these features, do not install the playground on your managed
 devices. In any case, installation is strongly discouraged unless you can at least make
 a backup of the original flash content via a SOIC clamp such as also used for BIOS
 backups and can re-install that firmware in case something is wrong. For this no soldering
@@ -54,192 +52,88 @@ devices by looking at the image using e.g. Ghidra. If you want to contribute to
 design of the web-interface or get a feeling for the interface first, a standalone
 device simulator is provided, which runs entirely under Linux as a local webserver.
-## (0) Compiling Requirements
+## Compiling
 Install the following particular build requisites (Debian 12/13), note that Ubuntu 24.04
 still has an older version of sdcc, but you will need sdcc version 4.5 for the code to compile:
 ```
 sudo apt install make gcc sdcc xxd python-is-python3 libjson-c-dev
 ```
 <details>
 <summary>If using Docker (click to expand)</summary>
 ### Prerequisites
 Install Docker for your platform:
 - **Linux (Debian/Ubuntu)**: `sudo apt install docker.io` then `sudo usermod -aG docker $USER` (log out and back in)
 - **Linux (other distros)**: Follow the [Docker Engine install guide](https://docs.docker.com/engine/install/)
 - **Windows**: Install [Docker Desktop for Windows](https://docs.docker.com/desktop/setup/install/windows-install/)
 - **macOS**: Install [Docker Desktop for Mac](https://docs.docker.com/desktop/setup/install/mac-install/)
 ### Usage
 A Dockerfile is provided for a reproducible build environment:
 ```
 docker build -t rtlplayground-dev .
 ```
 Build the firmware (replace MACHINE with your target, e.g. `DEFAULT_8C_1SFP`):
 ```
 docker run --rm -v $(pwd):/workspace rtlplayground-dev make MACHINE=DEFAULT_8C_1SFP
 ```
 The resulting `.bin` file appears in `output/` on your host.
 Build host tools only:
 ```
 docker run --rm -v $(pwd):/workspace rtlplayground-dev make -C tools
 ```
 Run the web-interface simulator locally:
 ```
 docker run --rm -p 8080:8080 -v $(pwd):/workspace rtlplayground-dev \
  tools/output/httpd_sim /workspace/html
 ```
 Edit `machine.h` or `config.txt` on your host, then re-run `make` — the
 source directory is mounted into the container, so changes take effect
 immediately. To build for a different machine, pass `MACHINE=...`.
 </details>
 ## (1) Compiling for direct chip flashing AND upgrading an existing RTLPlayground running device
 Edit machine.h with an editor like vi or nano. Select the correct machine the firmware should build for.
 > [!TIP]
 > You can write configuration parameters in config.txt (see below) in order your switch to get
 > straight at the first boot, a correct IP configuration.
 Now, building the firmware image should work:
 ```
 make 
 ```
-Note, that the image generated ends in .bin, not .img, in order to make IMSProg happy.
+Note, that the image generated ends in .bin, not .img, in order to make
-
+IMSProg happy.
 image location is stored in `RTLPlayground/output/rtlplayground_version_machine.bin`
 for example
 ```
 rtlplayground-v0.1.0-12c98ba-dirty-LIANGUO_ZX_SWTGW215AS.bin
 ```
 > [!CAUTION]
 > This image can be flashed directly to the chip OR through the firmware update/upgrade
 > interface of RTLPlaygound interface
 ## (2) Compiling for OEM running device with management options (web upgrade)
 Managed switches can be updated from the existing original firmware using a SPECIFIC upgrade image.
 You first need to build the firmware for direct chip flashing : See below (1)
 Then
 ```
 cd installer
 make 
 ```
 image location is stored in  `RTLPlayground/installer/output/rtlplayground_oem_upgrade.bin`
 > [!CAUTION]
 > This image must ONLY be used for original OEM firmware web interface firmware upgrade.
 > You do not need this image if you are already on RTLplayground firmware.
 > Unless you go back to the original OEM firmware, you would only flash this specific firmware
 > only once. Future upgrades of RTLPlayground will only need to follow (1)
 example of compilation console output
 Managed switches can be updated from the existing original firmware using an upgrade image.
 In the `installer`folder of the source code you will need to run `make` which will build
 an image out of `rtlplayground.bin` built in the previous step:
 ```
 RTLPlayground/installer$ make
-mkdir -p output
+mkdir -p output/
 gcc updatebuilder.c -o output/updatebuilder
 sdas8051 -plosgff -o output/crtstart.rel crtstart.asm
 sdcc -mmcs51 --code-loc 0x1000 -o output/installer.rel -c installer.c
 sdcc -mmcs51 -Wl-bHOME=0x1100 -Wl-r -o output/rtlinstaller.ihx output/crtstart.rel output/installer.rel
-./output/updatebuilder -i output/rtlinstaller.ihx -o output/rtlplayground_oem_upgrade.bin ../output/rtlplayground.bin
+cp ../output//rtlplayground.bin output/
 ./output//updatebuilder -i output/rtlinstaller.ihx output/rtlplayground.bin
 Input file size: 524288
 Bytes read: 524288
 EOF
-Payload sum 1 is: 0x25100
+Payload sum 1 is: 0x29d10
-Payload sum 2 is: 0x25100
+Payload sum 2 is: 0x29d10
-Payload sum with header is: 0x264ec
+Payload sum with header is: 0x2b0fc
-Payload sum is: 0xf8fe94
+Payload sum is: 0xad8a75
-Header checksum is: 0x5a1
+Header checksum is: 0x4c3
 ```
 The resulting image can be found in `RTLPlayground/installer/output/rtlplayground.bin`
 > [!CAUTION]
 > DO NOT UPLOAD THE UPGADE IMAGE UNLESS YOU CAN MAKE A BACKUP USING A SOIC CLAMP OF THE
 > ORIGINAL FIRMWARE!
-## (3) Sandbox Usage with Ghidra (optional)
+## Installation
 You can play with the image using ghidra or flash real Switch Hardware. For
 ghidra see this information about [Ghidra images](ghidra.md).
 ## (4) Installation through the Web interface (software way)
 Managed switches (OEM firmware of RTLplaygroud firmware) can be upgraded via the web interface.
 Unmanaged switch cannot be flashed this way (see 5).
 Go to "Firmware update" tab, select the correct file.
 > [!IMPORTANT]
 > If your device already runs RTLPlayground, you must upload the binary file /RTLPlayground/output/rtlplayground_Version_Machine.bin
 > If your device is OEM, you must upload the binary file /RTLPlayground/installer/outputrtlplayground_oem_upgrade.bin
 > [!CAUTION]
-> Check one more time that your device matches the machine type before flashing.
+> NOTE THAT WHILE THIS PROCEDURE HAS BEEN SUCCESSFULLY TESTED ON ALL DEVICES ABOVE,
-> Be shure you have a backup of the original firmware before diving in RTLPlaygroung.
+> ABSOLUTELY NO GUARANTY CAN BE GIVEN THAT YOU WILL NOT DESTROY YOUR SWITCH,
 > ANY OTHER EQUIPMENT INVOLVED OR HARM YOURSELF BY OPENING THE ELECTRONIC
 > DEVICE. OPENING THE SWITCH WILL VOID ITS WARRANTY.
-Finally, push the Upload File Button and you're done !
+You can upload the upgrade image of managed switches via the web interface of the
 original firmware just as if you were installing a firmware upgrade. However,
 this is strongly discouraged, as you may brick your device, unless you can make
 firmware backups via a SOIC clamp or soldered flash socket, first!
 For unmanaged devices, the only way to install RTLPlayground is by flashing the
 Flash memory directly.
-## (5) Flashing the ROM directly (hardware way, but also only way to rescue)
+You will need to open your switch to flash the image directly onto the flash chip,
 which is done easiest using a SOIC-8 clip (alternatively you de-solder the
 flash chip and install a SOIC adapter):
 - Disconnect power from switch
 - Attach the clip onto the flash chip
 - Connect USB of flash programmer, the power LED on the switch will light
  up, check cabling if not. Don't panic, mixing up GND and 3.3V does not
  seem to destroy the switch (at leasts the on I did this to).
 - Use IMSProg (flashrom should work, too) to detect the clip
 - MAKE A BACKUP OF THE EXISTING FIRMWARE!
 - then load the firmware into IMSProg
 - and program flash
-This procedure is the only way to flash unmanaged switches, if the ROM chip is large enough.
+Now you can connect a serial cable to the UART port found on all the
-This is also the only way to unbrick your device if something went wroong.
+devices, set 8N1 @ 115200 baud and power up the switch.
-> [!IMPORTANT]
+The device will perform some examples and provide a minimal console, the
-> You need a SOIC-8 clip to flash the ROM chip directly onboard.
+documentation of which can be found in the source code rtlplayground.c`.
 > Alternatively you can de-solder the flash chip and install a SOIC adapter).
 > For flashing the chip directly, you must use the binary file /RTLPlayground/output/rtlplayground_Version_Machine.bin
-> [!CAUTION]
+## The web-interface
-> As you need to open your switch case, consider that the warranty is gone.
+The web-interface can be reached under the [default 192.168.10.247](http://192.168.10.247).
-
+The default password is `1234`.
 - Disconnect power from switch.
 - Open the switch.
 - Attach the clip onto the flash chip (Red line on Pin 1, Pin 1 has a point marker).
 - Connect USB of flash programmer, the power LED on the switch will light up, check cabling if not.
 - Don't panic, mixing up GND and 3.3V usually does not destroy the switch.
 - Use IMSProg, Flashrom, or whatever Programmer to detect the chip.
 - MAKE A BACKUP (DUMP) OF THE EXISTING FIRMWARE !
 - ERASE THE ROM (BLANK) !
 - Load the firmware into IMSProg.
 - Flash is to the ROM chip.
 - Disconect the clip from the ROM chip.
 - You're done, ready for the first boot.
 ## (6) Connecting a serial interface (optional)
 You can connect a serial cable to the UART port found on all the devices, set 8N1 @ 115200 baud.
 ## (7) Power Up
 When you power up the switch, the device will perform some examples and provide a minimal console
 (if wired to a serial interface), the documentation of which can be found in the source code rtlplayground.c`.
 ## (8) The web-interface
 The web-interface can be reached under the [default 192.168.10.247](http://192.168.10.247) unless you
 specified an IP adress in the config.txt before compilation.
 > [!TIP]
 > The default password is `1234`.
 ## (9) The command line
 ## The command line
 The command line is very rudimentary and mostly for testing purposes.
 The following is a boot-log with some examples:
 ```
@@ -304,6 +198,7 @@ PORT 04 1G
 <MODULE INSERTED>  Rate: 67  Encoding: 01
 Lightron Inc.   WSPXG-ES3LC-IHA 0000
 > stat
  CMD: stat
 Port   State   Link    TxGood          TxBad           RxGood          RxBad
@@ -321,40 +216,17 @@ Lightron Inc.   WSPXG-ES3LC-IHA 0000
  CMD: sfp
 Rate: 67  Encoding: 01
 Lightron Inc.   WSPXG-ES3LC-IHA 0000
 ```
 ## (10) Advanced configuration
 You can configure more deeply the switch without the need of the console mode.
 While in compilation part, you might write directly to config.txt file before making the binary firmware
 ```
 nano config.txt
 ```
 If you want to modify settings after the flash is done, go to the Advanced Settings tab in System Settings
 <img width="1085" height="646" alt="ADVANCED SETTINGS" src="doc/images/advanced_settings.png" />
 ```
 ip xxx.xxx.xxx.xxx      = IP adress of the switch
 gw yyy.yyy.yyy.yyy      = IP adress of the gateway
 netmask zzz.zzz.zzz.zzz = Network mask of the switch 
 port x name xxx         = Name xxx the port number x
 port z 1g               = Set 1g speed for port z
 igmp on/off             = Turn IGMP on or off
 ```
 [To be continue]
 Enjoy playing!
-## (11) Other documents
+## Other documents
-
+The following documents give further documentation on specific features of
-The following documents give further documentation on specific features of the RTL837x SoCs:
+the RTL837x SoCs:
 - [RTL8372/3 Feature support](doc/hardware.md)
 - [CPU Port](doc/CpuPort.md)
 - [L2 learning](doc/l2.md) 
 - [CPU Port](doc/CpuPort.md)
 - [IGMP (IP-MC streaming)](doc/igmp.md)
 - [SFP+ ports](doc/sfp.md) 
 - [Trunking aka. port aggregation](doc/trunking.md)
@@ -40,24 +40,21 @@ void cmd_edit(void) __banked
 {
 	while (l != sbuf_ptr) {
 		if (sbuf[l] >= ' ' && sbuf[l] < 127) { // A printable character, copy to command line
-			// Reserve one byte for the terminating NUL written on Enter. When the
+			if (cmd_line_len >= CMD_BUF_SIZE)
-			// line is full, drop the character but still fall through to advance the
+				continue;
-			// serial-ring read pointer below; a 'continue' here would spin forever.
+			write_char(sbuf[l]);
-			if (cmd_line_len < CMD_BUF_SIZE - 1) {
+			// Shift buffer to right
-				write_char(sbuf[l]);
+			for (uint8_t i = cmd_line_len; i > cursor; i--)
-				// Shift buffer to right
+				cmd_buffer[i] = cmd_buffer[i-1];
-				for (uint8_t i = cmd_line_len; i > cursor; i--)
+			// Insert char in comand buffer
-					cmd_buffer[i] = cmd_buffer[i-1];
+			cmd_buffer[cursor++] = sbuf[l];
-				// Insert char in comand buffer
+			cmd_line_len++;
-				cmd_buffer[cursor++] = sbuf[l];
+			// Print rest of line
-				cmd_line_len++;
+			for (uint8_t i = cursor; i < cmd_line_len; i++)
-				// Print rest of line
+				write_char(cmd_buffer[i]);
-				for (uint8_t i = cursor; i < cmd_line_len; i++)
+			// Move backwards
-					write_char(cmd_buffer[i]);
+			for (uint8_t i = cursor; i < cmd_line_len; i++)
-				// Move backwards
+				write_char('\010'); // BS works like cursor-left
 				for (uint8_t i = cursor; i < cmd_line_len; i++)
 					write_char('\010'); // BS works like cursor-left
 			}
 		} else if (sbuf[l] == '\033') { // ESC-Sequence
 			// Wait until we have at least 3 characters including the ESC character in the serial buffer
 			if (((sbuf_ptr + SBUF_SIZE - l) & SBUF_MASK) < 3)
@@ -193,14 +190,14 @@ void cmd_edit(void) __banked
 		// Check whether return was pressed:
 		if (sbuf[l] == '\n' || sbuf[l] == '\r') {
 			write_char('\n');
-			cmd_buffer[cmd_line_len] = NUL;
+			cmd_buffer[cmd_line_len] = '\0';
 //			write_char('>'); print_string_x(cmd_buffer); write_char('<');
 			// If there is a command we print the prompt after execution
 			// otherwise immediately because there is nothing to execute
 			if (cmd_line_len)
 				cmd_available = 1;
 			else
-				print_cmd_prompt();
+				print_string("\n> ");
 			cursor = 0;
 			cmd_line_len = 0;
 			history_editptr = 0xffff;
@@ -7,13 +7,10 @@
 extern __xdata uint8_t cmd_buffer[CMD_BUF_SIZE];
 extern __xdata uint8_t cmd_available;
 extern __xdata uint8_t err_status;
 void cmd_tokenize(void) __banked;
 void cmd_parser(void) __banked;
 void execute_config(void) __banked;
 void execute_commands(__xdata uint8_t *p) __banked;
 void print_sw_version(void) __banked;
 void clear_command_history(void) __banked;
 #endif
@@ -1,29 +0,0 @@
 	.area HOME    (CODE)
 	.area GSINIT0 (CODE)
 	.area GSINIT1 (CODE)
 	.area GSINIT2 (CODE)
 	.area GSINIT3 (CODE)
 	.area GSINIT4 (CODE)
 	.area GSINIT5 (CODE)
 	.area GSINIT  (CODE)
 	.area GSFINAL (CODE)
 	.area CSEG    (CODE)
 	.area HOME    (CODE)
 __sdcc_banked_call::
 	push	_PSBANK
 	xch	a,r0
 	push	a
 	mov	a,r1
 	push	a
 	mov	a,r2
 	anl	a,#0x1f
 	mov	_PSBANK, a
 	xch	a, r0
 	ret
 __sdcc_banked_ret::
 	pop	_PSBANK
 	ret
@@ -0,0 +1,17 @@
 	.area GSFINAL (CODE)
 __sdcc_banked_call::
 	push	_PSBANK
 	xch	a,r0
 	push	a
 	mov	a,r1
 	push	a
 	mov	a,r2
 	anl	a,#0x1f
 	mov	_PSBANK, a
 	xch	a, r0
 	ret
 __sdcc_banked_ret::
 	pop	_PSBANK
 	ret
@@ -0,0 +1,23 @@
 #ifndef _CHACHA_H_
 #define _CHACHA_H_
 #include <stdint.h>
 struct chacha20_t {
 	uint8_t wstate[64];		// 64 bytes written here
 	uint8_t constant[16];		// 128 bit constant
        uint8_t key[32];		// 256-bit secret key
        uint32_t cnt;			// 32-bit block counter 1, 2.. Big Endian!
        uint8_t nonce[12];		// 96-bit nonce
        __xdata uint8_t *plaintext;
        uint16_t length;
        __xdata uint8_t *cyphertext;
 };
 // Encrypt a plaintext with ChaCha20 as per RFC7539
 void chacha20_encrypt(void);
 // Test ChaCha20 using the example from RFC7539
 void chacha20_test(void);
 #endif
@@ -0,0 +1,98 @@
 #include "rtl837x_common.h"
 #include "chacha.h"
 void chacha_20(void);
 void chacha_update(void);
 void chacha_count(void);
 // generate a block of ChaCha20 keystream as per RFC7539
 __xdata struct chacha20_t __at(0x7000) chacha20;
 __xdata uint8_t plaintext[256];
 __xdata uint8_t cyphertext[256];
 void chacha20_print_block(void)
 {
        for (uint8_t i=0; i < 64; i++) {
            print_byte(*(uint8_t * __xdata)(chacha20.wstate + i));
 	    if (i%4 == 3)
 		    write_char(' ');
        }
 }
 void chacha20_encrypt(void)
 {
 	__xdata uint8_t *p = chacha20.plaintext;
 	while (chacha20.length) {
 		register uint8_t i;
 		chacha_count();
 		memcpy(chacha20.wstate, chacha20.wstate + 64, 64);
 #ifdef DEBUG
 		chacha20_print_block(); write_char('\n');
 #endif
 		chacha_20();
 		chacha_update();
 #ifdef DEBUG
 		chacha20_print_block(); write_char('\n');
 #endif
 		for (i = 0; i < ((chacha20.length > 64) ? 64 : chacha20.length); i++)
 			*chacha20.cyphertext++ = *p++ ^ chacha20.wstate[i];
 		chacha20.length -= chacha20.length > 64 ? 64 : chacha20.length;
 #ifdef DEBUG
 		print_string("\n  round done\n");
 #endif
 	};
 }
 // Test the example of RFC 7539 Section 2.4.2
 void chacha20_test(void)
 {
 	__code uint8_t chacha_c[16] =
 		{ 0x61, 0x70, 0x78, 0x65,  0x33, 0x20, 0x64, 0x6e,
 		  0x79, 0x62, 0x2d, 0x32,  0x6b, 0x20, 0x65, 0x74 };
 	__code uint8_t key[32] =
 		{ 0x03, 0x02, 0x01, 0x00,  0x07, 0x06, 0x05, 0x04,
 		  0x0b, 0x0a, 0x09, 0x08,  0x0f, 0x0e, 0x0d, 0x0c,
 		  0x13, 0x12, 0x11, 0x10,  0x17, 0x16, 0x15, 0x14,
 		  0x1b, 0x1a, 0x19, 0x18,  0x1f, 0x1e, 0x1d, 0x1c };
 	__code uint8_t nonce[12] = {
 		  0x00, 0x00, 0x00, 0x00,  0x4a, 0x00, 0x00, 0x00,
 		  0x00, 0x00, 0x00, 0x00 };
 	__code uint8_t sunscreen[] = "Ladies and Gentlemen of the class of '99: If I could offer you only one tip for " \
 				     "the future, sunscreen would be it.";
 /*
 	Ciphertext Sunscreen (from RFC 7539 Section 2.4.2):
 	000  6e 2e 35 9a 25 68 f9 80 41 ba 07 28 dd 0d 69 81  n.5.%h..A..(..i.
 	016  e9 7e 7a ec 1d 43 60 c2 0a 27 af cc fd 9f ae 0b  .~z..C`..'......
 	032  f9 1b 65 c5 52 47 33 ab 8f 59 3d ab cd 62 b3 57  ..e.RG3..Y=..b.W
 	048  16 39 d6 24 e6 51 52 ab 8f 53 0c 35 9f 08 61 d8  .9.$.QR..S.5..a.
 	064  07 ca 0d bf 50 0d 6a 61 56 a3 8e 08 8a 22 b6 5e  ....P.jaV....".^
 	080  52 bc 51 4d 16 cc f8 06 81 8c e9 1a b7 79 37 36  R.QM.........y76
 	096  5a f9 0b bf 74 a3 5b e6 b4 0b 8e ed f2 78 5e 42  Z...t.[......x^B
 	112  87 4d 
 */
 	strcpy(plaintext, sunscreen);
 	memcpyc(chacha20.constant, chacha_c, 16);
 	memcpyc(chacha20.key, key, 32);
 	chacha20.cnt = 0;
 	memcpyc(chacha20.nonce, nonce, 12);
 	chacha20.plaintext = plaintext;
 	chacha20.length = strlen_x(plaintext);
 	chacha20.cyphertext = cyphertext;
 	print_string("Encrypting...\n");
 	chacha20_encrypt();
 	print_string("Cypertext:\n");
 	uint16_t len = strlen_x(plaintext);
 	for (uint8_t i = 0; i < len; i++) {
 		print_byte(cyphertext[i]); write_char(' ');
 	}
 }
@@ -0,0 +1,489 @@
 ; ChaCha Quater-Round implementation in Assembler
 	.module chacha_8051
 ; Global variables:
 	.globl _chacha_20
 	.globl _chacha_test_1
 	.globl _chacha_qr_r
 	.globl _chacha_update
 	.globl _chacha_count
 ;#define CHACHA_QR(A, B, C, D) { \
 ;    A += B; D ^= A; D = ROTL32(D, 16);  \
 ;    C += D; B ^= C; B = ROTL32(B, 12);  \
 ;    A += B; D ^= A; D = ROTL32(D, 8);   \
 ;    C += D; B ^= C; B = ROTL32(B, 7);   \
 ;}
 ; 		r0      r1    r2   r3
 ; CHACHA_QR( v[ 0], v[ 4], v[ 8], v[12] );
 	.area HOME    (CODE)
 store_32:
 	ar7 = 0x07
 	ar6 = 0x06
 	ar5 = 0x05
 	ar4 = 0x04
 	ar3 = 0x03
 	ar2 = 0x02
 	ar1 = 0x01
 	ar0 = 0x00
 	mov	a, r7
 	movx	@dptr, a
 	dec	dpl
 	mov	a, r6
 	movx	@dptr, a
 	dec	dpl
 	mov	a, r5
 	movx	@dptr, a
 	dec	dpl
 	mov	a, r4
 	movx	@dptr, a
 	ret
 rol_b:
 	clr	c
 	mov	a, r7
 	rlc	a
 	mov	r7, a
 	mov	a, r6
 	rlc	a
 	mov	r6, a
 	mov	a, r5
 	rlc	a
 	mov	r5, a
 	mov	a, r4
 	rlc	a
 	mov	r4, a
 	clr	a
 	addc	a, r7
 	mov	r7, a
 	djnz	dpl, rol_b
 	ret
 print_regs:
 	push	a
 	push	ar6
 	push	ar7
 	push	dpl
 	mov	dpl, a
 	lcall	_print_byte
 	pop	dpl
 	pop	ar7
 	pop	ar6
 	pop	a
 chacha_plus_xor:
 ; Load A into registers r4-r7, A pointed to by r0
 	mov	dptr, #_chacha20
 	mov	dpl, r0
 	movx	a, @dptr
 	mov	r7, a
 	dec	dpl
 	movx	a, @dptr
 	mov	r6, a
 	dec	dpl
 	movx	a, @dptr
 	mov	r5, a
 	dec	dpl
 	movx	a, @dptr
 	mov	r4, a
 ; A += B, B pointed to by r1
 	mov	dpl, r1
 	movx	a, @dptr
 	add	a, r7
 	mov	r7, a
 	dec	dpl
 	movx	a, @dptr
 	addc	a, r6
 	mov	r6, a
 	dec	dpl
 	movx	a, @dptr
 	addc	a, r5
 	mov	r5, a
 	dec	dpl
 	movx	a, @dptr
 	addc	a, r4
 	mov	r4, a
 	mov	dpl, r0		; Store A back
 	mov	a, r7
 	movx	@dptr, a
 	dec	dpl
 	mov	a, r6
 	movx	@dptr, a
 	dec	dpl
 	mov	a, r5
 	movx	@dptr, a
 	dec	dpl
 	mov	a, r4
 	movx	@dptr, a
 ; D ^= A
 	mov	dpl, r3
 	movx	a, @dptr
 	xrl	a, r7
 	mov	r7, a
 	dec	dpl
 	movx	a, @dptr
 	xrl	a, r6
 	mov	r6, a
 	dec	dpl
 	movx	a, @dptr
 	xrl	a, r5
 	mov	r5, a
 	dec	dpl
 	movx	a, @dptr
 	xrl	a, r4
 	mov	r4, a
 	dec	dpl
 	ret
 chacha_qr:
 ; QR Part: A += B; D ^= A; D = ROTL32(D, 16);
 	acall	chacha_plus_xor
 ; rotate left 16. D is r4, r5, r6, r7 -> r6, r7, r4, r5
 	mov	a, r6
 	xch	a, r4
 	mov	r6, a
 	mov	a, r7
 	xch	a, r5
 	mov	r7, a
 	mov     dpl, r3 ; Store D
 	acall   store_32
 ;QR Part: C += D; B ^= C; B = ROTL32(B, 12);
 ; Swap A <-> C and D <-> B
 	mov	a, r0
 	xch	a, r2
 	mov	r0, a
 	mov	a, r1
 	xch	a, r3
 	mov	r1, a
 	acall	chacha_plus_xor
 ; rotate left 12. D is r4, r5, r6, r7 -> r5, r6, r7, r4
 	mov	a, r4
 	xch	a, r7
 	xch	a, r6
 	xch	a, r5
 	mov	r4, a
 	mov	dpl, #4
 	acall	rol_b
 	mov	dpl, r3	; Store D (being B)
 	acall	store_32
 ; Swap A <-> C and D <-> B
 	mov	a, r0
 	xch	a, r2
 	mov	r0, a
 	mov	a, r1
 	xch	a, r3
 	mov	r1, a
 	mov	dpl, r1	; Store B
 	acall	store_32
 ; QR Part A += B; D ^= A; D = ROTL32(D, 8);
 	acall	chacha_plus_xor
 	mov	a, r4
 	xch	a, r7
 	xch	a, r6
 	xch	a, r5
 	mov	r4, a
 	mov	dpl, r3	; Store D
 	acall	store_32
 ; QR Part
 ;    C += D; B ^= C; B = ROTL32(B, 7);
 line4:
 ; Swap A <-> C and D <-> B
 	mov	a, r0
 	xch	a, r2
 	mov	r0, a
 	mov	a, r1
 	xch	a, r3
 	mov	r1, a
 	acall	chacha_plus_xor
 ; Roll left 7 bits, start by rolling 8 bits left, then roll 1 to the right
 	mov	a, r4
 	xch	a, r7
 	xch	a, r6
 	xch	a, r5
 	mov	r4, a
 	clr	c
 	mov	a, r4
 	rrc	a
 	mov	r4, a
 	mov	a, r5
 	rrc	a
 	mov	r5, a
 	mov	a, r6
 	rrc	a
 	mov	r6, a
 	mov	a, r7
 	rrc	a
 	mov	r7, a
 	clr	a
 	rrc	a
 	add	a, r4
 	mov	r4, a
 ; Swap A <-> C and D <-> B
 	mov	a, r0
 	xch	a, r2
 	mov	r0, a
 	mov	a, r1
 	xch	a, r3
 	mov	r1, a
 	mov	dpl, r1	; Store B
 	acall	store_32
 	ret
 _chacha_test_1:
 	mov	r0, #3
 	mov	r1, #7
 	mov	r2, #11
 	mov	r3, #15
 	acall	line4
 	ret
 ; QUARTERROUND(2,7,8,13)
 _chacha_qr_r:
 	mov	r0, #11
 	mov	r1, #31
 	mov	r2, #35
 	mov	r3, #55
 	acall	chacha_qr
 	ret
 ;
 ; Implementation of 20 ChaCha Rounds (10 Double Rounds)
 ;
 _chacha_20:
 	push    acc
 	push    b
 	push    dpl
 	push    dph
 	push    ar7
 	push    ar6
 	push    ar5
 	push    ar4
 	push    ar3
 	push    ar2
 	push    ar1
 	push    ar0
 	push    psw
 	mov	b, #10 ; 10 Double rounds
 chacha_20_loop:
 ;	CHACHA_QR( v[ 0], v[ 4], v[ 8], v[12] );
 	mov r0, #3
 	mov r1, #19
 	mov r2, #35
 	mov r3, #51
 	acall	chacha_qr
 ;        CHACHA_QR( v[ 1], v[ 5], v[ 9], v[13] ); 7  23  39  55
 	mov r0, #7
 	mov r1, #23
 	mov r2, #39
 	mov r3, #55
 	acall	chacha_qr
 ; 	CHACHA_QR( v[ 2], v[ 6], v[10], v[14] ); 11 27  43  59
 	mov r0, #11
 	mov r1, #27
 	mov r2, #43
 	mov r3, #59
 	acall	chacha_qr
 ;	CHACHA_QR( v[ 3], v[ 7], v[11], v[15] ); 15 31  47  63
        mov r0, #15
        mov r1, #31
        mov r2, #47
        mov r3, #63
 	acall	chacha_qr
 ;	CHACHA_QR( v[ 0], v[ 5], v[10], v[15] ); 3  23  43  63
 	mov r0, #3
 	mov r1, #23
 	mov r2, #43
 	mov r3, #63
 	acall	chacha_qr
 ;	CHACHA_QR( v[ 1], v[ 6], v[11], v[12] ); 7  27  47  51
 	mov r0, #7
 	mov r1, #27
 	mov r2, #47
 	mov r3, #51
 	acall	chacha_qr
 ;	CHACHA_QR( v[ 2], v[ 7], v[ 8], v[13] ); 11 31  35  55
 	mov r0, #11
 	mov r1, #31
 	mov r2, #35
 	mov r3, #55
 	acall	chacha_qr
 ;	CHACHA_QR( v[ 3], v[ 4], v[ 9], v[14] ); 15 19  39  59
 	mov r0, #15
 	mov r1, #19
 	mov r2, #39
 	mov r3, #59
 	acall	chacha_qr
 	djnz	b, chacha_20_loop
 	pop     psw
 	pop     ar0
 	pop     ar1
 	pop     ar2
 	pop     ar3
 	pop     ar4
 	pop     ar5
 	pop     ar6
 	pop     ar7
 	pop     dph
 	pop     dpl
 	pop     b
 	pop     acc
 	ret
 ;
 ; Update ChaCHa state
 ;
 _chacha_update:
 	push    acc
 	push    b
 	push    dpl
 	push    dph
 	push    ar4
 	push    ar3
 	push    ar2
 	push    ar1
 	push    ar0
 	push    psw
 	mov	dptr, #_chacha20
 	mov	b, #16 ; 16 uint32
 update_loop:
 	mov	a, b ; multiply by 4 and subtract 1
 	rl	a
 	rl	a
 	dec	a
 ; Load Working State variable into registers r0-r3
 	mov	dpl, a
 	orl	a, #64	; Save pointer to state
 	mov	r4, a
 	movx	a, @dptr
 	mov	r3, a
 	dec	dpl
 	movx	a, @dptr
 	mov	r2, a
 	dec	dpl
 	movx	a, @dptr
 	mov	r1, a
 	dec	dpl
 	movx	a, @dptr
 	mov	r0, a
 ; Add to State variable
 	mov	a, r4
 	mov	dpl, a
 	movx	a, @dptr
 	add	a, r3
 	mov	r3, a
 	dec	dpl
 	movx	a, @dptr
 	addc	a, r2
 	mov	r2, a
 	dec	dpl
 	movx	a, @dptr
 	addc	a, r1
 	mov	r1, a
 	dec	dpl
 	movx	a, @dptr
 	addc	a, r0
 	mov	r0, a
 ; Store back state variable in LSB, first sequence (serialized)
 	mov	a, r4
 	xrl	a, #64	; Save pointer to working state
 	mov	dpl, a
 	mov	a, r0
 	movx	@dptr, a
 	dec	dpl
 	mov	a, r1
 	movx	@dptr, a
 	dec	dpl
 	mov	a, r2
 	movx	@dptr, a
 	dec	dpl
 	mov	a, r3
 	movx	@dptr, a
 	djnz	b, update_loop
 	pop     psw
 	pop     ar0
 	pop     ar1
 	pop     ar2
 	pop     ar3
 	pop     ar4
 	pop     dph
 	pop     dpl
 	pop     b
 	pop     acc
 	ret
 ;
 ; Increase counter in state
 ;
 _chacha_count:
 	push    acc
 	push    dpl
 	push    dph
 	mov	dptr, #_chacha20
 	mov	dpl, #112 + 3
 	movx	a, @dptr
 	inc	a
 	movx	@dptr, a	
 	jnc	chacha_count_done
 	dec	dpl
 	movx	a, @dptr
 	inc	a
 	movx	@dptr, a
 	jnc	chacha_count_done
 	dec	dpl
 	movx	a, @dptr
 	inc	a
 	movx	@dptr, a
 	jnc	chacha_count_done
 	dec	dpl
 	movx	a, @dptr
 	inc	a
 	movx	@dptr, a
 chacha_count_done:
 	pop     dph
 	pop     dpl
 	pop     acc
 	ret
@@ -41,7 +41,6 @@ __xdata uip_ipaddr_t server;
 #define DHCP_REBIND_LEN		4
 #define DHCP_CLIENT_ID		61
 #define DHCP_CLIENT_ID_LEN	7
 #define DHCP_HOSTNAME		12
 #define DHCP_REQUEST_IP		50
 #define DHCP_REQUEST_IP_LEN	4
 #define DHCP_PARAMS		55
@@ -117,20 +116,6 @@ void dhcp_addopt_client_id(void)
 }
 void dhcp_addopt_hostname(void)
 {
 	uint8_t len = 0;
 	while (hostname[len])
 		len++;
 	if (!len)
 		return;
 	DHCP_OPT[dhcp_state.opt_ptr++] = DHCP_HOSTNAME;
 	DHCP_OPT[dhcp_state.opt_ptr++] = len;
 	memcpy(&DHCP_OPT[dhcp_state.opt_ptr], hostname, len);
 	dhcp_state.opt_ptr += len;
 }
 void dhcp_addopt_request_ip(void)
 {
 	DHCP_OPT[dhcp_state.opt_ptr++] = DHCP_REQUEST_IP;
@@ -167,7 +152,6 @@ void dhcp_send_discover(void)
 	dhcp_addopt_client_id();
 	dhcp_addopt_request_ip();
 	dhcp_addopt_hostname();
 	DHCP_OPT[dhcp_state.opt_ptr++] = DHCP_PARAMS;
 	DHCP_OPT[dhcp_state.opt_ptr++] = 3;
@@ -204,7 +188,6 @@ void dhcp_send_request(void)
 	dhcp_addopt_client_id();
 	dhcp_addopt_request_ip();
 	dhcp_addopt_server_id();
 	dhcp_addopt_hostname();
 	DHCP_OPT[dhcp_state.opt_ptr++] = DHCP_PARAMS;
 	DHCP_OPT[dhcp_state.opt_ptr++] = 3;
@@ -351,12 +334,7 @@ void dhcp_start(void) __banked
 		return;
 	}
 	get_random_32();
-	// Workaround SDCC bug 4070: dhcp_state.transaction_id = SFR_DATA_U32;
+	dhcp_state.transaction_id = SFR_DATA_U32;
 	__xdata uint8_t * tid = &dhcp_state.transaction_id;
 	*tid++ = SFR_DATA_24;
 	*tid++ = SFR_DATA_16;
 	*tid++ = SFR_DATA_8;
 	*tid = SFR_DATA_0;
 	dhcp_state.state = DHCP_START;
 	print_string("dhcp_start done\n");
 }
@@ -370,10 +348,8 @@ void dhcp_stop(void) __banked
 }
-void dhcp_callback(uint16_t lport) __banked
+void dhcp_callback(void) __banked
 {
 	if (lport != HTONS(DHCPC_CLIENT_PORT)) // Is this call for us? If not, ignore it
 		return;
 	if (!dhcp_state.state)
 		return;
 	if (uip_closed()) {
@@ -16,7 +16,7 @@
 void dhcp_start(void) __banked;
 void dhcp_stop(void) __banked;
 // void dhcp_periodic(void) __banked;
-void dhcp_callback(uint16_t lport) __banked;
+void dhcp_callback(void) __banked;
 struct dhcp_state {
@@ -40,4 +40,9 @@ struct dhcp_state {
 typedef struct dhcp_state uip_udp_appstate_t;
 /* Finally we define the application function to be called by uIP. */
 #ifndef UIP_UDP_APPCALL
 #define UIP_UDP_APPCALL dhcp_callback
 #endif /* UIP_APPCALL */
 #endif
@@ -64,33 +64,3 @@ Writing 0x1 to register 0x7850 will transmit the frame. The Ethernet frame
 checksum and the TCP checksum are automatically calculated (offloaded) by the
 ASIC before transmitting on the wire.
 ## The RTL tag words
 The frame header uses the Realtek Remote Control Protocol (RRCP) format or
 the like.
 The `flags` word:
 ```
 bit15 EFID_EN | 14:12 EFID | 11 PRI_EN | 10:8 PRI |
 bit7  KEEP    | 6 VSEL     | 5 LEARN_DIS         | 4:0 VIDX
 ```
 All fields are in network byte order.
 * `EFID_EN`, `EFID`: look the destination up under this filtering ID
  instead of the port's own
 * `PRI_EN`, `PRI`: force the given priority on the frame
 * `KEEP`: keep the 802.1Q tagging of the frame exactly as injected,
  bypassing the egress tagging rules of the port
 * `VSEL`, `VIDX`: classify the frame into the VLAN at this index of the
  VLAN table
 * `LEARN_DIS`: do not learn the source address from this frame
 The `pmask` word: bit 15 is `ALLOW`, bits 14 to 0 are a port mask.
 * `ALLOW` clear: the mask is the egress set, the frame goes to exactly
  the ports given
 * `ALLOW` set: the ASIC looks the destination up as usual and the mask
  only limits which ports the result may use
@@ -1,55 +0,0 @@
 # 2G040210GSM
 The following is a documentation for the managed switch marked as `2G040210GSM`
 and sold by Mokerlink.
 ### Label specifications
 - **Name**: 4-port 2.5G Web Managed Switch
 - **Ports**:
  - 4 × RJ45: 10/100/1000/2500 Mbps
  - 2 × SFP+: 1000 / 2500 / 10000 Mbps
 - **Power**: 12V DC, 1A barrel connector 
 ### What works
 The device is fully supported:
 - All 4 2.5GBASE-T RJ45 ports work at 10/100/1000/2500 Mbps
 - The SFP+ port supports 1G, 2.5G and 10G modules 
 - LEDs work with the same indiciations as the OEM firmware (use KP_9000_6XHML_X2_V1_1 in machine.h if building yourself or the corresponding pre-compiled binary)
 - untested due to missing Hardware: SFP+ ports equipped with 1G or 2.5G SFPs.
 ### Hardware overview
 Front
 <img src="photos/2M-PCB43-V1.1-managed/2M-PCB43-V1.1-front.jpeg" width="300" />
 Label
 <img src="photos/2M-PCB43-V1.1-managed/2M-PCB43-V1.1-label.jpeg" width="300" />
 ### PCB overview
 **Board markings**
 - Top silkscreen: 2M-PCB43-V1.1
 Top side
 <img src="photos/2M-PCB43-V1.1-managed/2M-PCB43-V1.1-top.jpeg" width="300" />
 Bottom
 <img src="photos/2M-PCB43-V1.1-managed/2M-PCB43-V1.1-bottom.jpeg" width="300" />
 ### J1, serial console
 | `J8` pin | Signal      |
 | -------- | ----------- |
 | 1        | RX (Input)  |
 | 2        | TX (Output) |
 | 3        | GND         |
 | 4        | 3V3         |
 ## Power supply
 Input power is delivered via barell plug, `12V 1A` adapter was provided.
@@ -1,39 +0,0 @@
 # FG-4GT-2SX_V2.0
 Following is documentation for unmanaged switch marked as `FG-4GT-2SX_V2.0`.
 Original software is running UART on 9600 baud rate.
 ## Brands
 * Ruiying RY-4GT-2SX
 <img src="photos/FG-4GT-2SX_V2.0/RY-4GT-2SX_label.jpg" width="300" />
 ## What works
 - All four 2.5GBASE-T RJ45 ports at 10/100/1000/2500 Mbps  
 - Both SFP ports supporting 1G, 2.5G and 10G modules 
 - LEDs
 ## PCB overview
 **Board markings**  
 - Top silkscreen: FG-4GT-2SX_V2.0
 Front panel
 <img src="photos/FG-4GT-2SX_V2.0/chassis-front.jpg" width="300" />
 Top side
 <img src="photos/FG-4GT-2SX_V2.0/PCB-top.jpg" width="300" />
 Bottom
 <img src="photos/FG-4GT-2SX_V2.0/PCB-bottom.jpg" width="300" />
 ## Power supply
 Input power is delivered via barell plug, `12V 1A` adapter was provided.
@@ -1,79 +0,0 @@
 # FG-8GT-1SX
 Following is documentation for unmanaged switch marked as `FG-8GT-1SX`.
 Original software is running UART on 9600 baud rate.
 Using SPI clamp in-board is the only method for initial installation.
 ### Brands
 | Brand   | Type       | Managed | PCB        | Flash       | Chip RTL      |
 |---------|------------|---------|------------|-------------|---------------|
 | Ruiying | RY-8GT-1SX | No      | FG-8GT-1SX | GD25Q80ESIG | 8373N + 8224N |
 ### What works
 - All eight 2.5GBASE-T RJ45 ports at 10/100/1000/2500 Mbps
 - SFP port with 1G/2.5G/10G modules
 - LEDs
 ### PCB overview
 **Board markings**
 - Top silkscreen: FG-8GT-1SX
 Top side:
 <img src="photos/FG-8GT-1SX/PCB-top.jpg" width="600" />
 Bottom:
 <img src="photos/FG-8GT-1SX/PCB-bottom.jpg" width="600" />
 ### Serial console
 The PCB has five unpopulated through-holes near the SoC, with a white rectangle surrouding them, labeled as `J18` and a triangle points to the square shaped first pin.
 This is where the "expected" UART header should be soldered at, with redundant 3V3 VCC, but also with missing 0Ω resistors between TX/RX and SoC, so simply soldering a header would not work. One need also add the missing resistors or solder the pads together, while making sure not connecting unrelated pads.
 Numbered from the triangle, the header pinout is:
 | Position | Signal | GPIO   | Status      |
 |----------|--------|--------|-------------|
 | 1        | GND    | GND    | Internal    |
 | 2        | TX     | GPIO31 | Unconnected |
 | 3        | RX     | GPIO32 | Unconnected |
 | 4        | 3V3    | -      | Internal    |
 | 5        | 3V3    | -      | Internal    |
 There're four resistor pads near the header.
 | Resistor ID | SoC Side    | Header Side |
 |-------------|-------------|-------------|
 | R1240       | TX / GPIO31 | Pin 2       |
 | R1243       | 3V3         | -           |
 | R1242       | 3V3         | Pin 3       |
 | R1241       | RX / GPIO32 | -           |
 To get TX working, solder a 0Ω resistor between the pads for R1240 or solder them together.
 For RX However, the designer certainly made a mistake, as the SoC-side lines to the resistor expected for Rx (R1242) and 3V3 (R1241) are swapped. For RX to work, the R1241 SoC side and R1242 header side shall be connected, so either:
 - Solder: R1241 SoC side -> R1241 header side -> R1242 header side
 - Jump wire: R1241 SoC side -> R1242 header side
 Be sure not to bring R1242 SoC side to the connection as that would wire Rx to 3v3.
 A complete working serial header should look like following on this PCB:
 <img src="photos/FG-8GT-1SX/Serial.png" width="600" />
 - **Settings**: 115200 baud / 8N1 / 3.3V TTL
 - Connect a USB-TTL adapter: adapter GND → pin 1, RX → pin 2, TX → pin 3
 ### Power supply
 Input power is delivered via barell plug, `12V 1A` adapter was provided.
@@ -1,93 +0,0 @@
 # FOXNEO FNS-1200P
 RTL8372-based 4×2.5G PoE+ + 2×SFP+ unmanaged switch.
 Using SPI clamp in-board is the only method for initial installation.
 ### Label specifications
 - **Manufacturer**: FOXNEO
 - **Model**: FNS-1200P
 - **Ports**:
  - 4 × RJ45: 10/100/1000/2500 Mbps with PoE+
  - 2 × SFP+: 1G / 2.5G / 10G
 ### What works
 - All four 2.5GBASE-T RJ45 ports at 10/100/1000/2500 Mbps (PoE+ is not configurable via RTLPlayground)
 - Both SFP+ ports supporting 1G, 2.5G and 10G modules
 - LEDs: amber (2.5G) and green (1G/100M/10M) per copper port; combined link/act on SFP ports
 ### PCB overview
 **Board markings**
 - Top silkscreen: PCB-K0402W-U13-V2.0 / DIP-K0402WB-V2.0
 **Key components**
 - U3: SPI NOR flash, 2 MiB
 - U7: unpopulated SOP8 footprint — I2C bus (RTL8372 slave at 0x5c) is accessible from its pads, useful for register dumps
 - S1: unpopulated slide switch footprint (three through-holes used as serial console)
 Front panel
 <img src="photos/FNS-1200P/chassis-front.jpg" width="400" />
 Top side (PCB)
 <img src="photos/FNS-1200P/PCB-top.jpg" width="300" />
 ### Port layout
 | Front panel position | Logical port | Physical port | Type    |
 |----------------------|--------------|---------------|---------|
 | SFP left             | 8            | 5             | SFP+    |
 | RJ45 1               | 4            | 1             | Copper  |
 | RJ45 2               | 5            | 2             | Copper  |
 | RJ45 3               | 6            | 3             | Copper  |
 | RJ45 4               | 7            | 4             | Copper  |
 | SFP right            | 3            | 6             | SFP+    |
 ### Serial console
 The PCB has three unpopulated through-holes intended for a slide switch, directly connected to UART0.
 Numbered from the left (SFP port side), the pinout is:
 | Position (left→right) | Signal | GPIO                     |
 |-----------------------|--------|--------------------------|
 | 1 (leftmost)          | RX     | GPIO32\_UART0\_RX (32)   |
 | 2 (middle)            | GND    | GND                      |
 | 3 (rightmost)         | TX     | GPIO31\_UART0\_TX (31)   |
 - **Settings**: 115200 baud / 8N1 / 3.3V TTL
 - Connect a USB-TTL adapter: adapter TX → pin 1, GND → pin 2, adapter RX → pin 3
 ### LED configuration
 Copper ports use LED SET0, SFP ports use LED SET1.
 | SET  | LED0                                             | LED2                                              |
 |------|--------------------------------------------------|---------------------------------------------------|
 | SET0 | Amber — lights on 2.5G link                      | Green — lights on 1G / 100M / 10M link            |
 | SET1 | All speeds — lights on any link with activity    | —                                                 |
 LED pad to physical port mapping:
 | GPIO pads | Port                    |
 |-----------|-------------------------|
 | GPIO8–11  | Physical port 5 (left SFP)  |
 | GPIO12–14 | Physical port 1 (RJ45 1)    |
 | GPIO15–17 | Physical port 2 (RJ45 2)    |
 | GPIO18–20 | Physical port 3 (RJ45 3)    |
 | GPIO21–23 | Physical port 4 (RJ45 4)    |
 | GPIO24–27 | Physical port 6 (right SFP) |
 ### SFP GPIO assignments
 | SFP              | pin\_detect (ModAbs)        | pin\_los               | SerDes | I2C SDA              | I2C SCL                  |
 |------------------|-----------------------------|------------------------|--------|----------------------|--------------------------|
 | Left (logical 8) | GPIO30\_ACL\_BIT3\_EN       | GPIO37                 | SDS1   | GPIO39\_I2C\_SDA4    | GPIO40\_I2C\_SCL3\_MDC1  |
 | Right (logical 3)| GPIO50\_I2C\_SCL2\_UART1\_TX | GPIO51\_I2C\_SDA2\_UART1\_RX | SDS0 | GPIO41\_I2C\_SDA3\_MDIO1 | GPIO40\_I2C\_SCL3\_MDC1 |
 GPIO assignments were verified by observing GPIO state changes during SFP module insertion/removal
 and cross-checked against an original firmware register dump.
 `pin_tx_disable` is GPIO\_NA on both ports (original firmware keeps all GPIOs as inputs).
@@ -0,0 +1,62 @@
 # Hisource Hi-K0402WS
 Following is documentation for unmanaged switch marked as `Hi-K0402WS`.
 Original software is running UART on 9600 baud rate. 
 Using SPI clamp in-board is the only method for initial installation.
 The board has two flash chips `BY25Q16BS` with 16M-bit size. The front switch, switches between the two flash chips.
 These can be programed independently by using said switch - so it is e.g. possible to run the original and new firmware in parallel.
 ### Label specifications
 - **Name**: 2.5G Ethernet Switch  
 - **Model**: Hi-K0402WS  
 - **Ports**:  
  - 4 × RJ45: 10/100/1000/2500 Mbps  
  - 2 × SFP: 1000 / 2500 / 10000 Mbps  
 ### What works (expected from label + similar devices)
 - All four 2.5GBASE-T RJ45 ports at 10/100/1000/2500 Mbps  
 - Both SFP ports supporting 1G, 2.5G and 10G modules 
 - LEDs
 ### PCB overview
 **Board markings**  
 - Top silkscreen: PCB-KO4022W-V3.0 / DIP-KO4022WS-V3.0  
 Top side
 <img src="photos/K0402W-V3.0-unmanaged\PCB-top.jpg" width="300" />
 Bottom
 <img src="photos/K0402W-V3.0-unmanaged\PCB-bottom.jpg" width="300" />
 ### T2, serial console
 | `J2` pin | Signal      |
 | -------- | ----------- |
 | 1        | 3V3         |
 | 2        | RX (Input) |
 | 3        | TX (Output)  |
 | 4        | GND         |
 ## Power supply
 Input power is delivered via barell plug, `12V 1A` adapter was provided.
 Board has two supply rails. `0.95` and `3.3` volt.
 ### `0.95` Core Voltage
 Voltage is made by a `Techcode TD1720` .
 ### `3.3` Voltage
 Voltage is created by chip marked as `Techcode TD1720`.
 **There seems to have been a miscalculation when choosing the inductor and the device is ~25% more efficient with an 5V power supply.**
@@ -1,36 +0,0 @@
 # Hisource Hi-K0801WS
 Following is documentation for unmanaged switch marked as `Hi-K0801WS`.
 Using SPI clamp in-board is the only method for initial installation.
 ### Label specifications
 - **Name**: 2.5G Ethernet Switch  
 - **Model**: Hi-K0801WS  
 - **Ports**:  
  - 8 × RJ45: 10/100/1000/2500 Mbps  
  - 1 × SFP: 1000 / 2500 / 10000 Mbps  
 ### What works (expected from label + similar devices)
 - All eight 2.5GBASE-T RJ45 ports at 10/100/1000/2500 Mbps  
 - SFP port supporting 1G, 2.5G and 10G modules 
 - LEDs
 ### PCB overview
 **Board markings**  
 - Top silkscreen: PCB-KO801W-V2.0 / DIP-KO801WS-V2.0  
 Top side
 <img src="photos/K0801W-V2.0-unmanaged\PCB-top.jpg" width="300" />
 Bottom
 <img src="photos/K0801W-V2.0-unmanaged\PCB-bottom.jpg" width="300" />
 ## Power supply
 Input power is delivered via barell plug, `12V 1A` adapter was provided.
@@ -1,93 +0,0 @@
 # Keeplink KP-9000-6XH-X2 / KP-9000-6XHML-X2
 Following is documentation for switches marked as `KP-9000-6XH-X2` or
 `KP-9000-6XHML-X2`.
 Using SPI clamp in-board is the only method for initial installation.
 ### Label specifications
 - **Name**: 4X 2.5G RJ45 Port + 2 X 10G SFP+ Port  
 - **Model**: KP-9000-6XH-X2 / KP-9000-6XHML-X2
 - **Ports**:  
  - 4 × RJ45: 10/100/1000/2500 Mbps  
  - 2 × SFP+: 1000 / 2500 / 10000 Mbps  
 ### Machine target
 These devices exist with different PCB revisions. Select the machine target by
 the PCB silkscreen, not by the label on the case. The `6XH` / `6XHML`
 distinction appears to be a stock firmware, SKU or label difference, not a
 reliable indicator of PCB wiring. The PCB revision defines the hardware layout.
 | PCB silkscreen | Known labels / devices | Recommended machine target | Equivalent target | Legacy target |
 | --- | --- | --- | --- | --- |
 | `2M-PCB43-V1.1` | Mokerlink 2G040210GSM web-managed 4+2 switch | `MACHINE_KP_9000_6XHML_X2_V1_1` | `MACHINE_KP_9000_6XH_X2_V1_1` | `MACHINE_KP_9000_6XHML_X2` |
 | `2M-PCB43-V1.2` | `KP-9000-6XHML-X2` | `MACHINE_KP_9000_6XHML_X2_V1_2` | `MACHINE_KP_9000_6XH_X2_V1_2` | `MACHINE_KP_9000_6XHML_X2` |
 | `2M-PCB43-V2.1` | `KP-9000-6XH-X2`, `KP-9000-6XHML-X2` | `MACHINE_KP_9000_6XH_X2_V2_1` or `MACHINE_KP_9000_6XHML_X2_V2_1` | same V2.1 layout | `MACHINE_KP_9000_6XH_X2` |
 The V1.1 and V1.2 boards currently use the same V1.x GPIO, SFP, port and LED
 layout. The V2.1 board uses a different V2.1 layout with custom LED muxing.
 Legacy targets are preserved for compatibility with already-tested devices, but
 new builds should prefer the explicit PCB-revision targets.
 ### What works
 - All four 2.5GBASE-T RJ45 ports at 10/100/1000/2500 Mbps
 - SFP port with 10G modules 
 - LEDs
 - untested due to missing Hardware: SFP+ ports equipped with 1G or 2.5G SFPs.
 ### Hardware overview: 2M-PCB43-V2.1
 Front side:
 <img src="photos/2M-PCB43-V2.1-unmanaged/KP-9000-6XH-X2-front.jpg" width="600" />
 Label:
 <img src="photos/2M-PCB43-V2.1-unmanaged/KP-9000-6XH-X2-label.jpg" width="600" />
 ### PCB overview
 **Board markings**  
 - Top silkscreen: 2M-PCB43-V2.1
 Top side
 <img src="photos/2M-PCB43-V2.1-unmanaged/2M-PCB43-V2.1-top.jpg" width="600" />
 Bottom
 <img src="photos/2M-PCB43-V2.1-unmanaged/2M-PCB43-V2.1-bottom.jpg" width="600" />
 ### Hardware overview: 2M-PCB43-V1.1 / V1.2
 The V1.1 board has been reported in the Mokerlink 2G040210GSM web-managed 4+2
 switch. The V1.2 board has been seen in managed `KP-9000-6XHML-X2` devices.
 Both use the same V1.x layout.
 Label:
 <img src="photos/KP-9000-6XHML-X2/label.jpg" width="600" />
 Top side:
 <img src="photos/KP-9000-6XHML-X2/pcb_top.jpg" width="600" />
 Bottom:
 <img src="photos/KP-9000-6XHML-X2/pcb_bottom.jpg" width="600" />
 ## Reset Button
 There's an unpopulated Reset button on the front left side of the PCB.
 It can easily be soldered, you'll need an 4.5mmx4.5mm 90° button switch with a 3-pin footprint.
 I got mine here: https://de.aliexpress.com/item/1005007295346702.html
 The front case has already the hole in the metal case, you just have to punch a hole through the foil.
 ## Power supply
 Input power is delivered via barell plug, `12V 1A` adapter was provided.
@@ -1,76 +0,0 @@
 # PCB-K0402WS-V3.0
 Following is documentation for a variety of unmanaged switch internally marked as `PCB-K0402WS-V3.0`. They are sold under many brands.
 Original software is running UART on 9600 baud rate.
 Note during opening the device: there might be a hidden 5th screw on the back
 of the device just above the big label, might be covered by a QC sticker.
 ### Brands
 * Hisource Hi-K0402WS
 <img src="photos/PCB-K0402WS-V3.0/HiSource_HI-K0402WS.jpg" width="300" />
 * Ztyuav Z-QWYT0402
 <img src="photos/PCB-K0402WS-V3.0/Ztyuav_Z-QWYT0402.jpg" width="300" />
 <img src="photos/PCB-K0402WS-V3.0/Ztyuav_Z-QWYT0402_label.jpg" width="300" />
 ### Programming
 Using SPI clamp in-board is the only method for initial installation.
 The board has two flash chips `BY25Q16BS` with 16M-bit size. The front switch, switches between the two flash chips.
 These can be programed independently by using said switch - so it is e.g. possible to run the original and new firmware in parallel.
 The switch actually controls the HOLD line of each flash chip, and toggling the switch results in a reboot.
 If the programming clip keeps HOLD not connected, the flashing will commence on whatever the switch selected, regardless on which chip was clipped.
 For the initial flash (at least with flashrom), the bin file produced by the build is much smaller than the flash chip, it is suggested to pad the file to keep flashrom happy: `truncate -s 2097152 rtlplayground-*-PCB_K0402WS_V3.bin`. Note: do not then proceed to use this resulting padded file for the web flashing (as it bricks the device), use the original unpadded .bin.
 ### What works (expected from label + similar devices)
 - All four 2.5GBASE-T RJ45 ports at 10/100/1000/2500 Mbps  
 - Both SFP ports supporting 1G, 2.5G and 10G modules 
 - LEDs
 ### PCB overview
 **Board markings**  
 - Top silkscreen: PCB-KO4022W-V3.0 / DIP-KO4022WS-V3.0  
 Top side
 <img src="photos/PCB-K0402WS-V3.0/PCB-top.jpg" width="300" />
 Bottom
 <img src="photos/PCB-K0402WS-V3.0/PCB-bottom.jpg" width="300" />
 ### T2, serial console
 | `J2` pin | Signal      |
 | -------- | ----------- |
 | 1        | 3V3         |
 | 2        | RX (Input) |
 | 3        | TX (Output)  |
 | 4        | GND         |
 ## Power supply
 Input power is delivered via barell plug, `12V 1A` adapter was provided.
 Board has two supply rails. `0.95` and `3.3` volt.
 ### `0.95` Core Voltage
 Voltage is made by a `Techcode TD1720` .
 ### `3.3` Voltage
 Voltage is created by chip marked as `Techcode TD1720`.
 **There seems to have been a miscalculation when choosing the inductor and the device is ~25% more efficient with an 5V power supply.**
@@ -1,43 +0,0 @@
 # Steamemo IG204-V1
 Following is documentation for unmanaged switch marked as `IG204-V1`.
 Using SPI clamp in-board is the only method for initial installation.
 ### Label specifications
 - **Name**: 2.5G Ethernet Switch  
 - **Model**: IG204 V1
 - **Ports**:  
  - 4 × RJ45: 10/100/1000/2500 Mbps  
  - 2 × SFP: 1000 / 2500 / 10000 Mbps  
 ### What works (expected from label + similar devices)
 - Four 2.5GBASE-T RJ45 ports at 10/100/1000/2500 Mbps  
 - Two SFP ports supporting 1G, 2.5G and 10G modules 
 - LEDs
 ### PCB overview
 **Board markings**  
 - Top silkscreen: PB-2131
 Top side
 <img src="photos/STEAMEMO_IG204_V1/PCB-top.jpg" width="600" />
 ### Connectors
 ### T7, serial console
 | `T7` pin | Signal      |
 | -------- | ----------- |
 | 1        | TX (Output) |
 | 2        | GND         |
 | 3        | RX (Input)  |
 | 4        | 3V3         |
 ### Power supply
 Input power is delivered via barell plug, `12V 1A` adapter was provided.
@@ -1,10 +1,4 @@
 # SWTG018AS-A V2.0
 ## Brands
 | Brand  | Type             |Managed| PCB              | Flash           | Chip RTL      |
 |--------|------------------|-------|------------------|-----------------|---------------|
 | Ampcom | SWTG018AS-A V2.0 | No    | SWTG018AS-A V2.0 | 2MB             | 8273N + 8224N |
 | Horaco | HC-SWTGW218AS-A  | Yes   | SWTG018AS-A V2.0 | 2MB(25Q16JVSIQ) | 8273N + 8224N |
 The following is a documentation for the unmanaged switch marked as `SWTG018AS-A V2.0`.
 It is e.g. sold under the Ampcom brand, but no branh-markings are found on the device.
@@ -1,43 +0,0 @@
 ### SWTG024AS-A-V2.0.1_4C_2SFP
 It is highly similar to SWTG024AS-V2.0, with the only difference being the GPIO configuration for the SFP port.
 ## Brands
 |Brand|Type|Managed|PCB|Flash|Chip RTL|
 |---|---|---|---|---|---|
 | Horaco | ZX-SG4T2 |  | PCB-SWTG024AS-A-V2.0.1_19650 | P25D40SH | ??? |
 ### Label specifications
 - **Name**: 
 - **Ports**:
  - 4 × RJ45: 10/100/1000/2500 Mbps
  - 2 × SFP+: 1000 / 2500 / 10000 Mbps
 <img src="photos/SWTG024AS-A-V2_0_1_19650/horaco-zx-sg4t2-label.jpg" width="300" />
 ### What works
 The device is fully supported:
 - ALL 2.5GBASE-T RJ45 ports work at 10/100/1000/2500 Mbps
 - The SFP+ port supports 1G, 2.5G and 10G modules 
 ### PCB overview
 **Board markings**
 - Top silkscreen: PCB-SWTG024AS-A-V2.0.1_19650
 Top side
 <img src="photos/SWTG024AS-A-V2_0_1_19650/horaco-zx-sg4t2-pcb-top.jpg" width="300" />
 Bottom
 <img src="photos/SWTG024AS-A-V2_0_1_19650/horaco-zx-sg4t2-pcb-bottom.jpg" width="300" />
 ### J1, serial console
 | `J1` pin | Signal      |
 | -------- | ----------- |
 | 1        | 3V3         |
 | 2        | GND         |
 | 3        | RX (Input)  |
 | 4        | TX (Output) |
@@ -1,44 +0,0 @@
 ### SWTG024AS-A-V2.0.1_5C_1SFP
 It is highly similar to SWTG024AS-V2.0, with the only difference being the GPIO configuration for the SFP port.
 ## Brands
 |Brand|Type|Managed|PCB|Flash|Chip RTL|
 |---|---|---|---|---|---|
 | Horaco | HC-SWTGW215AS |  | PCB-SWTG024AS-A-V2.0.1_19650 | W25Q16JV | 8272N |
 ### Label specifications
 - **Name**: 
 - **Ports**:
  - 5 × RJ45: 10/100/1000/2500 Mbps
  - 1 × SFP+: 1000 / 2500 / 10000 Mbps
 <!-- <img src="" width="300" /> -->
 ### What works
 The device is fully supported:
 - ALL 2.5GBASE-T RJ45 ports work at 10/100/1000/2500 Mbps
 - The SFP+ port supports 1G, 2.5G and 10G modules 
 - LEDs work with the same indiciations as the OEM firmware
 ### PCB overview
 **Board markings**
 - Top silkscreen: PCB-SWTG024AS-A-V2.0.1_19650
 Top side
 <!-- <img src="" width="300" /> -->
 Bottom
 <!-- <img src="" width="300" /> -->
 ### J1, serial console
 | `J1` pin | Signal      |
 | -------- | ----------- |
 | 1        | 3V3         |
 | 2        | GND         |
 | 3        | RX (Input)  |
 | 4        | TX (Output) |
@@ -1,49 +0,0 @@
 ### SWTG024AS-V2.0
 ## Brands
 |Brand|Type|Managed|PCB|Flash|Chip RTL|
 |---|---|---|---|---|---|
 | hongyavision | LG-SG5T1 | No | PCB-SWTG024AS-V2.0_16895 | 25Q40 | 8272 |
 ### Label specifications
 - **Name**: 
 - **Ports**:
  - 5 × RJ45: 10/100/1000/2500 Mbps
  - 1 × SFP+: 1000 / 2500 / 10000 Mbps
 - **Power**: 12V DC, 1A  5525 connector 
 <img src="photos/SWTG024AS-V2.0/label.jpg" width="300" />
 ### What works
 The device is fully supported:
 - ALL 2.5GBASE-T RJ45 ports work at 10/100/1000/2500 Mbps
 - The SFP+ port supports 1G, 2.5G and 10G modules 
 - LEDs work with the same indiciations as the OEM firmware
 - Online update does not work with 512KiB flash.
 ### PCB overview
 **Board markings**
 - Top silkscreen: PCB-SWTG024AS-V2.0
 Top side
 <img src="photos/SWTG024AS-V2.0/pcb_top.jpg" width="300" />
 Bottom
 <img src="photos/SWTG024AS-V2.0/pcb_bottom.jpg" width="300" />
 ### J1, serial console
 | `J1` pin | Signal      |
 | -------- | ----------- |
 | 1        | GND         |
 | 2        | RX (Input)  |
 | 3        | TX (Output) |
 Note,`R52`、`R53`may not be installed.You need to bridge them using either solder or resistors.
 ## Power supply
 Input power is delivered via barell plug, `12V 1A` adapter was provided.
@@ -9,8 +9,8 @@ Also the RJ45 connectors can be all plastic/non-shielded or with metal shielding
 |Brand|Type|Managed|PCB|PCB Label|Flash|Chip RTL|
 |---|---|---|---|---|---|---|
 | LIANGUO |SWTG024AS |No|  SWTG024AS-v2.0-17452 | CM-23-11-2336 023-17453| 512 KiB | 8272 |
-| Horaco |ZX-SWTG124AS | Yes |  SWTG024AS-v2.0 | ??? | ??? | 8272 |
+| Haraco |ZX-SWTG124AS | Yes |  SWTG024AS-v2.0 | ??? | ??? | 8272 |
-| Xikestore |SKS3200M-4GPY2XF | Yes |  SWTG024AS-v1.0 | CM-23-08-2043 023-16721 | 2048 KiB | 8272 |
+| Xikestore |SKS3200M-4GPY2XF | Yes |  SWTG024AS-v1.0 | CM-23-08-2043 023-16721 | ??? | 8272 |
 | Sodola | SL-SWTG124AS-D | Yes | SWTG024AS-v2.0-17452 | ??? | 2048 KiB | 8272 |
 ## PCB
@@ -6,7 +6,6 @@
 | Mokerlink | ZX-SWTGW218AS | Yes|  SWTG118AS-V2.0-16029 | 2MB (FM25Q16A)| 8273N + 8224N |
 | Sodola | | | | | |
 | Horaco | | | | | |
 | XikeStor | SKS3200-8E1X | Yes | SWTG118AS-V2.1-17462 | 2MB (25Q16JVSIQ) | |
 ## Photos
@@ -1,59 +0,0 @@
 # ZX310S-4T2XH/
 The following is a documentation for the managed switch marked as `ZX310S-4T2XH`
 and sold by Horaco.
 The original software is running UART on 57600 baud rate. The solder holes
 of the UART header are filled in. In order to install a UART header, they
 need to be cleared first. A 1.2mm drill can be used, alternatively a
 de-soldering wick.
 The original firmware uses 57600 baud 8N1
 CPU: RTL8372
 Flash: 2MByte Winbond W25Q16DV (U3)
 PHY RTL8261BE
 ### Label specifications
 - **Name**: 
 - **Ports**:
  - 4 × RJ45: 10/100/1000/2500 Mbps
  - 1 x RJ45: 10/100/1000/2500/5000/10000 Mbps
  - 1 × SFP+: 1000 / 2500 / 10000 Mbps
 - **Power**: 12V DC, 2A barrel connector 
 <img src="photos/ZX310S-4T2XH/label.jpg" width="300" />
 ### What works
 The device is fully supported:
 - All 4 2.5GBASE-T RJ45 ports work at 10/100/1000/2500 Mbps
 - The 10GBit port works. TODO: Fix EEE, speed selection
 - The SFP+ port supports 1G, 2.5G and 10G modules 
 - LEDs work with the same indiciations as the OEM firmware
 ### PCB overview
 **Board markings**
 - Top silkscreen: PCB-SL310S-4T1T1X-V1.0.1-24107
 Top side
 <img src="photos/ZX310S-4T2XH/pcb_top.jpg" width="300" />
 Bottom
 <img src="photos/ZX310S-4T2XH/pcb_bottom.jpg" width="300" />
 ### J1, serial console
 | `J1` pin | Signal      |
 | -------- | ----------- |
 | 1        | TX (Output) |
 | 2        | RX (Input)  |
 | 3        | GND         |
 | 4        | 3V3         |
 ## Power supply
 Input power is delivered via barell plug, `12V 2A` adapter was provided.
@@ -1,53 +0,0 @@
 # ZX310S-4T2XT
 The following is a documentation for the managed switch marked as
 `ZX310S-4T2XT` and sold by Horaco.
 The original software is running UART on 57600 baud rate 8N1.
 CPU: RTL8372
 Flash: 2MByte Winbond W25Q16DV (U3)
 PHY 2x RTL8261BE
 ### Label specifications
 - **Name**:
 - **Ports**:
  - 4 × RJ45: 10/100/1000/2500 Mbps
  - 2 x RJ45: 10/100/1000/2500/5000/10000 Mbps
 - **Power**: 12V DC, 2A barrel connector
 <img src="photos/ZX310S-4T2XT/label.jpg" width="300" />
 ### What works
 The device is fully supported:
 - All 4 2.5GBASE-T RJ45 ports work at 10/100/1000/2500 Mbps, including EEE
 - The 10GBit ports works, including EEE.
 - LEDs work with the same indiciations as the OEM firmware
 ### PCB overview
 **Board markings**
 - Top silkscreen: PCB-SL310S-4T2XT-V1.0.0-22273
 Top side
 <img src="photos/ZX310S-4T2XT/pcb_top.jpg" width="300" />
 Bottom
 <img src="photos/ZX310S-4T2XT/pcb_bottom.jpg" width="300" />
 ### J1, serial console
 | `J1` pin | Signal      |
 | -------- | ----------- |
 | 1        | TX (Output) |
 | 2        | RX (Input)  |
 | 3        | GND         |
 | 4        | 3V3         |
 ## Power supply
 Input power is delivered via barell plug, `12V 2A` adapter was provided.
@@ -65,36 +65,3 @@ ASIC and flushing the table in order to quickly forget the learned entries.
 3c:18:a0:7e:11:00 0x0001  learned 5
 1c:2a:a3:23:00:02 0x0001  learned 7
 ```
 ## Static multicast entries
 Slow-protocol frames such as LACPDUs and STP BPDUs have to reach the CPU
 without being flooded to the other ports. No bridge relays these frames:
 their addresses are in the set that 802.1D-2004 clause 7.12.6 forbids a
 bridge to forward, and what travels the network is the information, with
 every bridge regenerating BPDUs of its own on its designated ports. The reserved-multicast *trap* action
 cannot do that on this hardware, because its destination is an external CPU
 attached to a physical port, which these boards do not populate. The protocol
 modules therefore leave the reserved-multicast action at *forward* and constrain
 the egress with a static L2 multicast entry instead: the lookup hits the entry's
 own port mask rather than the VLAN flood mask. Verified on a SWTGW218AS both
 ways, with the CPU bit cleared, where delivery stops, and with the CPU bit alone,
 where nothing egresses.
 `port_l2mc_set()` writes one such entry. The SMI layout is the L2 multicast
 variant of the table entry:
 ```
 DATA_IN_A = MAC bytes 5..2                            -> c2 00 00 <mac_last>
 DATA_IN_B = MAC[1..0] | vid<<16 | IVL<<29 | pmask[1:0]<<30
 DATA_IN_C = pmask[9:2]
 ```
 Lookups are IVL, so an entry made for VID 0 is never matched and a caller adds
 one entry per PVID in use. The write goes through the table access register
 with the table selector set to the L2 lookup table, `TBL_L2_UNICAST` in the
 code, a name that despite appearances covers the multicast entries as well.
 The hardware hashes MAC and VID to pick the bucket slot by itself.
 Writing the same MAC and VID again replaces the entry rather than adding a
 second one, so a caller can retarget the mask at will, for instance back to all
 ports to restore flooding.
@@ -92,7 +92,7 @@ The following shows the network configuration
 On _both_ switches create a LAG with ports 1 and 2 inside and the default hash algorithm which takes
 source and destination ports into account, e.g. just use the default:
 ```
-> lag 1 1 2
+> lag 0 1 2
 ```
@@ -37,13 +37,12 @@ This list is incomplete.
 | Brand      | Partnumber |
 | ---------- |----------- |
 | GigaDevice | GD25Q32E   |
 | Fundan     | FM25Q16A   |
 | Puya       | P25D40SH   |
 | Winbond    | W25Q16JV   |
 | Winbond    | W25Q32FV   |
 | Winbond    | W25Q32JV   |
 | Winbond    | W25Q16JL   |
 | Winbond    | W25Q16DV   |
 | Winbond    | W25Q80DV   |
 | Fundan     | FM25Q16A   |
 *NOTE*: Part numbers are incomplete. Part numbers may contain additional information such as package, temperature specifications, and even the number of devices on a reel. So always check the datasheet so that you have the right orderable partnumber.
@@ -1,155 +0,0 @@
 # Spanning Tree (STP / RSTP)
 The switch can take part in a spanning tree (IEEE 802.1D / 802.1w) so that
 redundant links between bridges are blocked instead of forming a loop. The
 implementation elects a root bridge from the BPDUs it receives, promotes ports
 to forwarding once their listen period expires, ages the root out when it goes
 silent, and blocks a port on which it sees its own BPDU.
 STP can be enabled and controlled via the web interface or the command line,
 as follows:
 ## Quick start
 ```
 stp on                  # start participating
 stp off                 # stop, all ports back to forwarding
 ```
 Live status is on the Spanning Tree page of the web UI (or `/stp.json`),
 and on the serial console via `stp status`.
 With no other bridge around, the switch elects itself root and every port ends
 up forwarding — you can leave it on safely. Put the settings in the startup
 config to make them survive a reboot:
 ```
 stp prio 15
 stp port 1 edge on
 stp on
 ```
 ## Hardware background
 BPDUs are addressed to `01:80:C2:00:00:00`, a reserved link-local group. The
 ASIC's Reserved-Multicast action for that address decides what happens to the
 frame.
 Forwarding to the CPU port works normally: the 8051 sits behind an ordinary
 port of the internal switch and is an ordinary member of a forwarding mask.
 The *trap* action does not deliver to it. Its destination is an external CPU
 attached to a physical port (`cpuTag_externalCpuPort_set`, `EXT_CPU_CTRL` in
 the vendor SDK), which these boards do not populate. The ACL trap and
 redirect actions do not deliver to the 8051 either.
 Delivery therefore uses the *forward* action, constrained to the CPU port
 by a static L2 multicast entry (`port_l2mc_set()`), one per VLAN in use:
 * while STP runs, the entry's member mask is the CPU port only — BPDUs reach
  the CPU and are not flooded to other ports, as a participating bridge
  requires;
 * with STP off, the same entries are retargeted to all ports, restoring the
  transparency an unmanaged switch is expected to have, so a surrounding
  spanning tree can span *through* this device.
 A BPDU delivered this way is an ordinary frame to the port's ingress logic
 and passes through its acceptable-frame-type filter. BPDUs are untagged, so a
 port set to admit tagged frames only (`ingress <port>t`) never delivers one
 to the CPU. `stp_setup()` prints a warning for every STP-enabled port in that
 state.
 Port states live in `RTL837X_MSTP_STATES (0x5310)`, two bits per port:
 `00` disabled, `01` blocking, `10` learning, `11` forwarding. A port in
 blocking forwards nothing between ports, but it still sends what the CPU
 hands it and still passes a received BPDU up to the CPU, which is what lets
 loop detection go on working on a port it has already blocked.
 ## Timers
 `stp_timers()` runs at 50 Hz (the main loop idles on the 200 Hz system tick and
 STP is called every fourth pass), which is what `STP_HZ` in `rtl837x_stp.h`
 encodes. All configured values are in seconds:
 | setting | default | range |
 |---|---|---|
 | `stp hello <n>` | 2 | 1–10 |
 | `stp maxage <n>` | 20 | 6–40 |
 | `stp fwd <n>` | 15 | 4–30 |
 | `stp txhold <n>` | 6 | 1–10 |
 A port entering the tree spends `fwd` seconds in blocking before it forwards
 (an edge port skips the wait). Root information is discarded after `maxage`
 seconds without a BPDU, and the switch then reclaims the root role.
 ## Topology changes
 A change on a local non-edge port (the link coming or going, a port promoted
 to forwarding) flushes the addresses learned on it and sets the TC flag in
 our BPDUs for `maxage + fwd` seconds. A TC flag received in a BPDU is passed
 on: the switch flushes the other non-edge ports once and keeps the flag in
 its own BPDUs until one hello after the last flagged frame, so the
 notification crosses the switch instead of dying at it. A legacy TCN is
 acknowledged with TCA and then treated like a local change.
 ## Bridge settings
 ```
 stp prio <0-15>         # bridge priority = n * 4096, default 8 (32768)
 stp version rstp|stp    # RST BPDUs (default) or legacy Config BPDUs
 stp hello|maxage|fwd|txhold <seconds>
 ```
 The bridge with the lowest priority wins the root election; ties are broken by
 the MAC address. If you do not want this switch to become the root of an
 existing network, give it a worse priority than the current root — `stp prio 15`
 (61440) is the usual "never me" value.
 ## Per-port settings
 ```
 stp port <1-9> on|off              # take part in STP, or stay plain forwarding
 stp port <1-9> edge on|off|auto    # host-facing port handling (default: auto)
 stp port <1-9> cost <0-200000000>  # path cost, 0 = automatic (20000)
 stp port <1-9> prio <0-240>        # port priority, steps of 16
 stp port <1-9> guard none|bpdu|root
 stp port <1-9> filter on|off       # neither send nor accept BPDUs
 stp port <1-9> p2p auto|on|off
 ```
 **edge** — an edge port forwards immediately and does not trigger a
 topology change when its link comes and goes; `auto` promotes a port to edge
 after three seconds without a BPDU, and demotes it as soon as one arrives. Use
 `edge on` for ports where only hosts are attached.
 **guard** — `bpdu` disables a port as soon as a BPDU arrives on it (a host port
 should never see one); `root` keeps a port from ever becoming the path to the
 root, which protects an existing topology from a newly attached bridge that
 claims a better priority.
 **filter** — the port neither sends nor accepts BPDUs. Useful when the device
 on the far side reacts badly to them (some unmanaged switches with loop
 prevention cut the link) but you still want STP on the rest of the ports.
 ## Status
 The Spanning Tree page shows the elected root (priority and MAC), the path cost
 to it, the root port, the topology-change counter and, per port, the live state
 read from the ASIC together with the configured options. The same data is
 available as JSON:
 ```
 GET /stp.json
 ```
 The `stp status` command prints the same view on the serial console.
 ## Limitations
 * One spanning-tree instance; no MSTP, no per-VLAN trees.
 * No proposal/agreement handshake — an RST-capable neighbour will still
  converge, but through the timers rather than the fast transition.
 * Port roles are approximated: the root port and designated ports are
  distinguished, alternate/backup are not.
 * Topology changes propagate away from the root only: nothing is announced
  on the root port (no TCN and no BPDUs at all), so bridges upstream rely on
  their own detection.
@@ -1,135 +0,0 @@
 # Supporting Multiple Languages in the Web UI
 The firmware uses a client-side i18n approach
 all translations are stored in a single JavaScript dictionary embedded in the firmware.
 No server-side changes are needed.
 ## Architecture
 All translation logic lives in `html/i18n.js`. The file contains:
 - A `LANG` object with one sub-object per language (`en`, `ja`, ...)
 - Language auto-detection (browser language → `localStorage` override)
 - `t(key)` — look up a translated string
 - `setLang(lang)` — switch language and update the page
 - `applyTranslation(el)` — apply translation to one DOM element
 Translation keys are **flat strings** (no nesting). The English keys in `LANG.en` also serve as the fallback when a key is missing in another language.
 ## How to Add a New Language
 ### 1. Add a dictionary entry in `html/i18n.js`
 Append a new sub-object to the `LANG` object. Every key from `LANG.en` must be present:
 ```js
 var LANG = {
  en: {
    nav_overview: 'Overview',
    nav_port_config: 'Port Configuration',
    // ... all keys for English
  },
  ja: {
    nav_overview: '概要',
    nav_port_config: 'ポート設定',
    // ... all keys for Japanese
  },
  LANGCODE: {            // ← add your language here
    nav_overview: '...',
    nav_port_config: '...',
    // ... translate every key
  },
 };
 ```
 ### 2. Add the language to the navigation sidebar
 In `html/navigation.js`, add an `<option>` to the language selector:
 ```js
 + "<option value='en'>English</option><option value='ja'>日本語</option>"
 ```
 Replace with:
 ```js
 + "<option value='en'>English</option><option value='ja'>日本語</option><option value='LANGCODE'>Native Name</option>"
 ```
 ### 3. Verify auto-detection
 The language detection code in `i18n.js` reads `navigator.language` and normalises it to the first two characters:
 ```js
 var browser = (navigator.language || navigator.userLanguage || 'en').substring(0, 2);
 return LANG[browser] ? browser : 'en';
 ```
 If the two-letter code matches a key in `LANG`, it will be auto-selected. No changes needed here.
 ## Two Translation Mechanisms
 ### (A) `data-i18n` attribute (declarative — for HTML)
 Add `data-i18n="key_name"` to any HTML element. The English text goes in the element content as a fallback:
 ```html
 <h1 data-i18n="port_heading">Port Configuration</h1>
 <input type="button" data-i18n="port_apply" value="Apply">
 <option data-i18n="port_auto">Auto</option>
 <title data-i18n="port_title">Port Configuration</title>
 ```
 On page load, `applyTranslation()` sets:
 - `el.value` for `<input type="submit|button">`
 - `el.textContent` for `<option>`, `<title>`
 - `el.innerHTML` for everything else
 ### (B) `t('key')` call (imperative — for JavaScript strings)
 When generating HTML or text in JavaScript, wrap translatable strings with `t()`:
 ```js
 td.appendChild(document.createTextNode(t('common_port') + i));
 td.innerHTML = t('port_auto');
 iHTML += "<tr><td>" + t('port_vendor') + "</td></tr>";
 ```
 ### Special Case: Link Speed Display
 The `linkS` array in `html/main.js` maps numeric link states to display strings. The first two entries (`speed_disabled`, `speed_down`) use `t()` for translation; the remaining entries are static literals (they are the same in all languages):
 ```js
 const linkS = [
  function(){return t('speed_disabled')},
  function(){return t('speed_down')},
  "10M", "100M", "1000M", "500M", "10G", "2.5G", "5G"
 ];
 function linkText(idx) { var v = linkS[idx]; return typeof v === 'function' ? v() : v; }
 ```
 Always use `linkText(idx)` (not `linkS[idx]`) to read these values.
 ## Size Considerations
 - `html/i18n.js` is embedded in the firmware filesystem (~14 KB for two languages)
 - Each new language adds roughly the same number of bytes as the English dictionary (~3–4 KB)
 - The firmware binary is padded to 512 KiB, so a few extra KB do not change the flash footprint
 - Values that are identical in all languages should be inlined as literals rather than added to the dictionary (e.g., `"10M"`, `"2.5G"`, `"MAC"`, `"VLAN"`, `"CPU"`)
 ## Build
 No special flags are needed. The `html/` directory is embedded by `fileadder` during the build.
 ## Script Load Order
 `i18n.js` must be loaded after `main.js` (which defines `t()`'s dependencies like `LANG`) but before any page-specific JS that calls `t()`:
 ```html
 <script src="/main.js"></script>
 <script src="/i18n.js"></script>
 <script src="/eee.js"></script>    <!-- uses t() -->
 ```
 The `navigation.js` script is loaded last (bottom of `<body>`).
@@ -1,41 +1,17 @@
 # Supported Hardware
 The following devices have been tested and are fully working:
 - Horaco ZX_SG4T2
 - keepLINK kp-9000-6hx-x2 (RTL8372: 4x 2.5GBit + 2x 10GBit SFP+)
 - keepLINK KP-9000-6XHML-X2, same as above, but Managed
 - keepLINK kp-9000-6hx-x (RTL8372 + RTL8221B 2.5GBit PHY: 5 x 2.5GBit + 1x 10GBit SFP+)
 - keepLINK kp-9000-9xh-x-eu (1 x RTL8373 + RTL8224: 8x 2.5GBit + 1x 10GBit SFP+)
 - Lianguo LG-SWTGW218AS (RTL8373 + RTL8224 PHY: 8x 2.5GBit + 1x 10GBit SFP+)
 - No-Name ZX-SWTGW215AS, managed version of kp-9000-6hx-x, ordered on
  AliExpress as keepLINK 5+1 port managed
 - TrendNet TEG-S562 (RTL8372: 4x 2.5GBit + 2x 10GBit SFP+)
-| Brand    | Type            | Managed | PCB                                                                       | Flash | Ports |
+Other device based on RTL8272/3 that may work are described here: [Up-N-Atoms 2.5 GBit RTL Switch hacking guide]
-|----------|-----------------|---------|---------------------------------------------------------------------------|-------|-------|
+(https://github.com/up-n-atom/SWTG118AS)
 | Ampcom   | WAM902-SWTG018AS| No      | [SWTG018AS-A V2.0](devices/SWTG018AS_A_V2_0.md)                           |       | 8 + 1 |
 | Davuaz   | Da-K6501W       | No      | [PCB-K0501W-V2.0](devices/K0501W_V2_0.md)                                 |       | 5 + 1 |
 | FOXNEO   | FNS-1200P       | No      | [PCB-K0402W-U13-V2.0](devices/FNS-1200P.md)                               | 2M    | 4 + 2 |
 | Hisource | Hi-K0402WS      | No      | [PCB-K0402WS-V3.0](devices/PCB-K0402WS-V3.0.md)                           |       | 4 + 2 |
 | Hisource | Hi-K0801WS      | No      | [PCB-KO801W-V2.0](devices/HI-K0801WS.md)                                  |       | 8 + 1 |
 | hongyavision | LG-SG5T1    | No      | [PCB-SWTG024AS-V2.0_16895](devices/SWTG024AS-V2.0.md)                     | 0.5M  | 5 + 1 |
 | Horaco   | HC-SWTGW215AS   | Yes     | [SWTG024AS-A-V2.0.1_19650 5C 1SFP](devices/SWTG024AS-A-V2.0.1_5C_1SFP.md) | ?     | 5 + 1 |
 | Horaco   | HC-SWTGW218AS   | Yes     | [SWTG018AS-A V2.0](devices/SWTG018AS_A_V2_0.md)                           |       | 8 + 1 |
 | Horaco   | ZX310S-4T2XH    | Yes     | [PCB-SL310S-4T1T1X-V1.0.1-24107](devices/ZX310S-4T2XH.md)                 | 2M    | 5 + 1 |
 | Horaco   | ZX310S-4T2XT    | Yes     | [PCB-SL310S-4T2XT-V1.0.0-22273](devices/ZX310S-4T2XT.md)                  | 2M    | 6     |
 | Horaco   | ZX-SG4T2        | No      | [SWTG024AS-A-V2.0.1_19650_4C_2SFP](devices/SWTG024AS-A-V2.0.1_4C_2SFP.md) | 0.5M  | 4 + 2 |
 | Horaco   | ZX-SWTG124AS    | Yes     | [SWTG024AS-v2.0](devices/SWTG024AS.md)                                    |       | 4 + 2 |
 | Keeplink | KP-9000-6XH-X2 / KP-9000-6XHML-X2 | No/Yes | [2M-PCB43-V1.2 / V2.1](devices/KP-9000-6XH-X2.md) |       | 4 + 2 |
 | keepLINK | KP-9000-9XHML-X | Yes     | [2M-PCB23-V2.2](devices/2M-PCB23-V2_2.md)                                 | 2M    | 8 + 1 |
 | keepLINK | KP-9000-9XHML-X | Yes     | [2M-PCB23-V3.1](devices/2M-PCB23-V3_1.md)                                 | 2M    | 8 + 1 |
 | LIANGUO  | SWTG024AS       | No      | [SWTG024AS-v2.0-17452](devices/SWTG024AS.md)                              | 0.5M  | 4 + 2 |
 | Lianguo  | ZX-SWTGW215AS   | Yes     | [PCB-SWTG115AS-V2.0](devices/SWTGW215AS.md)                               | 2M    | 5 + 1 |
 | Mokerlink| 2G040210GSM     | Yes     | [2M-PCB43-V1.1](devices/2M-PCB43-V1.1.md)                                 |       | 4 + 2 |
 | Mokerlink| ZX-SWTGW218AS   | Yes     | [SWTG118AS-V2.0-16029](devices/SWTGW218AS.md)                             | 2M    | 8 + 1 |
 | Ruiying  | RY-4GT-2SX      | No      | [FG-4GT-2SX_V2.0](devices/FG-4GT-2SX_V2.0.md)                             | 4M    | 4 + 2 |
 | Ruiying  | RY-8GT-1SX      | No      | [FG-8GT-1SX](devices/FG-8GT-1SX.md)                                       | 1M    | 8 + 1 |
 | Sodola   | SL-SWTG124AS-D  | Yes     | [SWTG024AS-v2.0-17452](devices/SWTG024AS.md)                              | 2M    | 4 + 2 |
 | Steamemo | IG204-V1        | No      | [PB-2131](devices/STEAMEMO_IG204_V1.md)                                   |       | 4 + 2 |
 | TrendNet | TEG-S562        | No      | [TEG-S563/EU H/W: V1.0R](devices/TEG-S562.md)                             | 2M    | 4 + 2 |
 | Xikestore| SKS3200M-4GPY2XF| Yes     | [SWTG024AS-v1.0](devices/SWTG024AS.md)                                    |       | 4 + 2 |
 | XikeStor | SKS3200-8E1X    | Yes     | [SWTG118AS-V2.1-17462](devices/SWTGW218AS.md)                             | 2M    | 8 + 1 |
 | Ztyuav   | Z-QWYT0402      | No      | [PCB-K0402WS-V3.0](devices/PCB-K0402WS-V3.0.md)                           |       | 4 + 2 |
 For KP-9000-6XH-X2 / KP-9000-6XHML-X2 / Mokerlink 2G040210GSM devices, select
 the machine target by PCB revision. The ML/non-ML or managed/unmanaged label
 alone does not identify the wiring.
 Other device based on RTL8272/3 that may work are described here: [Up-N-Atoms 2.5 GBit RTL Switch hacking guide](https://github.com/up-n-atom/SWTG118AS)
 Many of the RTL8272/3 devices come in versions with PoE support. The RTLPlayground usually also
 works on these, however, no support for configuring PoE is provided, simply because these
@@ -79,12 +79,6 @@ vlan <VLAN-ID> d
 vlan show
  Dumps the current ingress vlan settings.
 vlan <VLAN-ID> mgmt
  Restricts network access to the switch (web UI, syslog) to the given
  VLAN. Use `vlan 0 mgmt` to disable the filter. Default is `vlan 1 mgmt`.
  Warning: setting this to an unreachable VLAN locks out the web UI;
  recovery requires serial console.
 pvid <port> <VLAN-ID>
  assigns PVID to a port. ports are numbered as on the casing
@@ -1,18 +1,17 @@
 <!DOCTYPE html>
 <html>
  <script src="/main.js"></script>
  <script src="/i18n.js"></script>
  <link rel="stylesheet" href="style.css">
-  <title data-i18n="bw_title">Ingress and Egress Bandwidth</title>
+  <title>Ingress and Egress Bandwidth</title>
  </head>
  <body>
    <nav id="sidebar"></nav>
    <div style="margin-left:16%;padding:1px 16px;height:1000px;">
    <div id="ports"></div>
-    <h1 data-i18n="bw_heading">Ingress and Egress Bandwidth</h1>
+    <h1>Ingress and Egress Bandwidth</h1>
    <table id="bwtable">
-      <tr> <th> </th> <th colspan="3" data-i18n="bw_ingress"> Ingress </th> <th colspan="2" data-i18n="bw_egress">Egress</th>  <th></th></tr>
+      <tr> <th> </th> <th colspan="3"> Ingress </th> <th colspan="2">Egress</th>  <th></th></tr>
-      <tr> <th data-i18n="bw_col_port">Port</th> <th data-i18n="bw_col_limit">Limit</th> <th data-i18n="bw_col_bandwidth">Bandwidth [kBit/s]</th> <th data-i18n="bw_col_flow">Flow Control</th> <th data-i18n="bw_col_limit">Limit</th> <th data-i18n="bw_col_bandwidth">Bandwidth [kBit/s]</th> <th data-i18n="bw_col_apply">Apply</th></tr>
+      <tr> <th>Port</th> <th>Limit</th> <th>Bandwidth [kBit/s]</th> <th>Flow Control</th> <th>Limit</th> <th>Bandwidth [kBit/s]</th> <th>Apply</th></tr>
    </table>
    <script src="/bandwidth.js"></script>
    </div>
@@ -6,18 +6,18 @@ function createBW() {
     console.log("CREATING TABLE ", tbl.rows.length);
     for (let i = 2; i < 2 + numPorts; i++) {
       const tr = tbl.insertRow();
-        let td = tr.insertCell(); td.appendChild(document.createTextNode(t('common_port') + (i-1)));
+       let td = tr.insertCell(); td.appendChild(document.createTextNode(`Port ${i-1}`));
       td = tr.insertCell();
       td.innerHTML = limit.replaceAll("limit_port", "ilimit_port_" + i).replace("exec()", "iClicked(" + i + ")");
       td = tr.insertCell();
-        td.innerHTML = t('bw_unlimited');
+       td.innerHTML = 'UNLIMITED';
-        td = tr.insertCell();
+       td = tr.insertCell();
-        td.innerHTML = limit.replaceAll("limit_port", "fc_port_" + i).replace("exec()", "document.getElementById('bwapply_" + i + "').disabled=false;");
+       td.innerHTML = limit.replaceAll("limit_port", "fc_port_" + i).replace("exec()", "document.getElementById('bwapply_" + i + "').disabled=false;");
-        td = tr.insertCell();
+       td = tr.insertCell();
-        td.innerHTML = limit.replaceAll("limit_port", "elimit_port_" + i).replace("exec()", "eClicked(" + i + ")");
+       td.innerHTML = limit.replaceAll("limit_port", "elimit_port_" + i).replace("exec()", "eClicked(" + i + ")");
-        td = tr.insertCell();
+       td = tr.insertCell();
-        td.innerHTML = t('bw_unlimited');
+       td.innerHTML = 'UNLIMITED';
-        var button = '<button type="button" id="bwapply_' + i + '" style="margin: 0 0 0 24px" onclick="applyBandwidth(' + i + ');">' + t('bw_col_apply') + '</button>';
+       var button = '<button type="button" id="bwapply_' + i + '" style="margin: 0 0 0 24px" onclick="applyBandwidth(' + i + ');">Apply</button>';
       td = tr.insertCell();
       td.innerHTML = button;
       document.getElementById("bwapply_" + i).disabled = true;
@@ -31,7 +31,7 @@ function iClicked(i)
  var tbl = document.getElementById('bwtable');
  var tr = tbl.rows[i];
  if (!document.getElementById("ilimit_port_" + i).checked) {
-            tr.cells[2].innerHTML = t('bw_unlimited');
+    tr.cells[2].innerHTML = "UNLIMITED";
    document.getElementById("fc_port_" + i).disabled = true;
    document.getElementById("fc_port_" + i).checked = true;
  } else {
@@ -47,7 +47,7 @@ function eClicked(i)
  var tbl = document.getElementById('bwtable');
  var tr = tbl.rows[i];
  if (!document.getElementById("elimit_port_" + i).checked) {
-            tr.cells[5].innerHTML = t('bw_unlimited');
+    tr.cells[5].innerHTML = "UNLIMITED";
  } else {
    tr.cells[5].innerHTML = '<input id="ebw_' + i + iLayout + i + ')" value="0"/>';
  }
@@ -110,12 +110,12 @@ function getBW() {
          document.getElementById("ilimit_port_" + (n+1)).checked = p.iLimited;
          document.getElementById("elimit_port_" + (n+1)).checked = p.eLimited;
          if (!p.iLimited) {
-    tr.cells[2].innerHTML = t('bw_unlimited');
+            tr.cells[2].innerHTML = "UNLIMITED";
          } else {
            tr.cells[2].innerHTML = '<input id="ibw_' + (n+1) + iLayout + (n+1) + ')" value="' + iBW +'"/>';
          }
          if (!p.eLimited) {
-    tr.cells[5].innerHTML = t('bw_unlimited');
+            tr.cells[5].innerHTML = "UNLIMITED";
          } else {
            tr.cells[5].innerHTML = '<input id="ebw_' + (n+1) + iLayout + (n+1) + ')" value="' + eBW +'"/>';
          }
@@ -1,100 +1,35 @@
 var configInterval = Number();
 var configuration = [];
 const conf_cmds = [
-  /^ip\s+(\d{1,3}\.){3}\d{1,3}$/,
+  /ip\s+(\d{1,3}\.){3}\d{1,3}/, /gw\s+(\d{1,3}\.){3}\d{1,3}/, /netmask\s+(\d{1,3}\.){3}\d{1,3}/,
-  /^ip\s+dhcp$/,
+  /eee(\s+\d)?\s+(on|off)/, /mirror(\s+(\d|10))(\s+(\d|10)(t|r)?)+/, /vlan\s+(\d{1,4})(\s+(\d|10)(t|u)?)+/
  /^gw\s+(\d{1,3}\.){3}\d{1,3}$/,
  /^netmask\s+(\d{1,3}\.){3}\d{1,3}$/,
  /^syslog\s+(on|off)$/,
  /^syslog\s+ip\s+(\d{1,3}\.){3}\d{1,3}$/,
  /^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]?)+$/,
  /^pvid\s+\d{1,2}\s+\d{1,4}$/,
  /^ingress(\s+\d{1,2}[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+$/,
  /^eee(\s+\d{1,2})?\s+(on|off)$/,
  /^mirror(\s+\d{1,2})(\s+\d{1,2}[tr]?)+$/,
  /^lag\s+\d(\s+\d{1,2})+$/,
  /^laghash\s+\d(\s+\w+)+$/,
  /^isolate\s+\d{1,2}(\s+(off|\d{1,2}))+$/,
  /^stp\s+(on|off)$/,
  /^stp\s+(prio|hello|maxage|fwd|txhold)\s+\d{1,2}$/,
  /^stp\s+version\s+(rstp|stp)$/,
  /^stp\s+port\s+\d{1,2}\s+(on|off)$/,
  /^stp\s+port\s+\d{1,2}\s+edge\s+(on|off|auto)$/,
  /^stp\s+port\s+\d{1,2}\s+cost\s+\d{1,9}$/,
  /^stp\s+port\s+\d{1,2}\s+prio\s+\d{1,3}$/,
  /^stp\s+port\s+\d{1,2}\s+guard\s+(none|bpdu|root)$/,
  /^stp\s+port\s+\d{1,2}\s+filter\s+(on|off)$/,
  /^stp\s+port\s+\d{1,2}\s+p2p\s+(auto|on|off)$/,
  /^igmp\s+(on|off)$/,
  /^mtu\s+\d{1,2}\s+\d+$/,
  /^bw\s+(in|out)\s+\d{1,2}\s+\S+$/,
  /^hostname\s+.{1,23}$/,
 ];
 const conf_overwrite = [
-  /^ip\b/,
+  /ip/, /gw/, /netmask/, /eee\s+\w+/, /eee(\s+\w)/, /mirror/, /vlan\s+(\d{1,4})/
  /^gw\b/,
  /^netmask\b/,
  /^syslog\s+ip\b/,
  /^syslog\b/,
  /^passwd\b/,
  /^vlan\s+\d{1,4}\s+mgmt$/,
  /^vlan\s+\d{1,4}(?!\s+mgmt\b)/,
  /^pvid\s+\d{1,2}\b/,
  /^ingress\b/,
  /^port\s+\d{1,2}(?!\s+name\b)/,
  /^port\s+\d{1,2}\s+name\b/,
  /^eee\s+\d{1,2}\b/,
  /^eee\b/,
  /^mirror\b/,
  /^lag\s+\d+\b/,
  /^laghash\b/,
  /^isolate\s+\d{1,2}\b/,
  /^stp\s+(prio|hello|maxage|fwd|txhold|version)\b/,
  /^stp\s+port\s+\d{1,2}\s+(edge|cost|prio|guard|filter|p2p)\b/,
  /^igmp\b/,
  /^mtu\s+\d{1,2}\b/,
  /^bw\s+(in|out)\s+\d{1,2}\b/,
  /^hostname\b/,
 ];
 function parseConf(s){
  var a = s.split(/\r\n|\n/);
-  for (var l = 0; l < a.length; l++) {
+    for (var l = 0; l < a.length; l++) {
-    var line = a[l].trim().replace(/\s+/g, ' ');
+      if (!a[l].length || a[l] == "\n" || a[l] == "\r\n")
-    if (!line.length) continue;
+        continue;
-    const deleteMatch = line.match(/^vlan\s+(\d{1,4})\s+d$/);
+      console.log(l + ' --> ' + a[l]);
-    if (deleteMatch) {
+      var ignore = true;
-      const prefix = "vlan " + deleteMatch[1] + " ";
+      for (const x of conf_cmds)
-      configuration = configuration.filter(c => !c.startsWith(prefix));
+        if (x.test(a[l])) ignore = false;
-      continue;
+      if (ignore) continue;
-    }
+      for (const x of conf_overwrite) {
-    console.log(l + ' --> ' + line);
+        if (x.test(a[l])) {
-    var ignore = true;
+          console.log("Match ", x, " to ", a[l]);
-    for (const x of conf_cmds)
+          m = a[l].match(x);
-      if (x.test(line)) { ignore = false; break; }
+          console.log("Starts with ", m[0]);
-    if (ignore) continue;
+          configuration = configuration.filter(item => !(item.startsWith(m[0])));
-    for (const x of conf_overwrite) {
+        }
      if (x.test(line)) {
        let m = line.match(x);
        let matchStr = m[0];
        configuration = configuration.filter(item =>
          !(item === matchStr || (item.startsWith(matchStr + " ") && !item.endsWith(" mgmt") && !item.startsWith(matchStr + " name "))));
        break;
      }
      configuration.push(a[l]);
    }
-    // Only one management VLAN can be active, so drop any previous mgmt entry
+    console.log("Configuration now:");
-    if (/^vlan\s+\d{1,4}\s+mgmt$/.test(line))
+    for (const x of configuration) { console.log(x); }
      configuration = configuration.filter(item => !/^vlan\s+\d{1,4}\s+mgmt$/.test(item));
    configuration.push(line);
  }
  console.log("Configuration now:");
  for (const x of configuration) { console.log(x); }
 }
 async function fetchConfig() {
@@ -1,22 +1,21 @@
 <!DOCTYPE html>
 <html>
  <script src="/main.js"></script>
  <script src="/i18n.js"></script>
  <link rel="stylesheet" href="style.css">
-  <title data-i18n="eee_title">EEE Configuration</title>
+  <title>EEE Configuration</title>
  </head>
  <body>
    <nav id="sidebar"></nav>
    <div style="margin-left:16%;padding:1px 16px;height:1000px;">
    <div id="ports"></div>
-    <h1 data-i18n="eee_heading">EEE Status</h1>
+    <h1>EEE Status</h1>
    <table id="eeetable">
-      <tr> <th> </th> <th colspan="3" data-i18n="eee_advertising"> Advertising </th> <th colspan="3" data-i18n="eee_partner">Link-Partner advertises</th>  <th></th></tr>
+      <tr> <th> </th> <th colspan="3"> Advertising </th> <th colspan="3">Link-Partner advertises</th>  <th></th></tr>
-      <tr> <th data-i18n="eee_port">Port</th> <th>2.5G</th> <th>1G</th> <th>100M</th> <th>2.5G</th> <th>1G</th> <th>100M</th>  <th data-i18n="eee_active">Active?</th></tr>
+      <tr> <th>Port</th> <th>2.5G</th> <th>1G</th> <th>100M</th> <th>2.5G</th> <th>1G</th> <th>100M</th>  <th>Active?</th></tr>
    </table>
    <div>
-      <input style="width:20%;" class="action" id="eee_enable" onclick="eeeSub(0, 1);" type="button" data-i18n="eee_enable" value="Enable EEE">
+      <input style="width:20%;" class="action" id="eee_enable" onclick="eeeSub(0, 1);" type="button" value="Enable EEE">
-      <input style="width:20%;" class="action" id="eee_disable" onclick="eeeSub(0, 0);" type="button" data-i18n="eee_disable" value="Disable EEE">
+      <input style="width:20%;" class="action" id="eee_enable" onclick="eeeSub(0, 0);" type="button" value="Disable EEE">
    </div>
    <script src="/eee.js"></script>
    <script src="/eee_sub.js"></script>
@@ -5,7 +5,7 @@ function createEEE() {
     for (let i = 2; i < 2 + numPorts; i++) {
      console.log("Table row: " + i + "pState: " + pState[i-2]);
      const tr = tbl.insertRow();
-      let td = tr.insertCell(); td.appendChild(document.createTextNode(t('common_port') + (i-1)));
+      let td = tr.insertCell(); td.appendChild(document.createTextNode(`Port ${i-1}`));
      for (let j = 0; j < 7; j++) {
        td = tr.insertCell(); td.appendChild(document.createTextNode(" "));
      }
@@ -28,8 +28,8 @@ function getEEE() {
          let tr = tbl.rows[n+1];
          if (!p.isSFP) {
            let eee = parseInt(p.eee,2); let lp = parseInt(p.eee_lp,2);
-            tr.cells[1].innerHTML = `${eee&4?t('eee_on'):t('eee_off')}`; tr.cells[2].innerHTML = `${eee&2?t('eee_on'):t('eee_off')}`; tr.cells[3].innerHTML = `${eee&1?t('eee_on'):t('eee_off')}`;
+            tr.cells[1].innerHTML = `${eee&4?"ON":"OFF"}`; tr.cells[2].innerHTML = `${eee&2?"ON":"OFF"}`; tr.cells[3].innerHTML = `${eee&1?"ON":"OFF"}`;
-            tr.cells[4].innerHTML = `${lp&4?t('eee_on'):t('eee_off')}`; tr.cells[5].innerHTML = `${lp&2?t('eee_on'):t('eee_off')}`; tr.cells[6].innerHTML = `${lp&1?t('eee_on'):t('eee_off')}`;
+            tr.cells[4].innerHTML = `${lp&4?"ON":"OFF"}`; tr.cells[5].innerHTML = `${lp&2?"ON":"OFF"}`; tr.cells[6].innerHTML = `${lp&1?"ON":"OFF"}`;
            tr.cells[7].innerHTML = `${p.active}`;
            tr.classList.toggle('disabled', pState[i-2] < 0); tr.classList.toggle('isNOK', !p.active); tr.classList.toggle('isOK', p.active);
          }
@@ -1,609 +0,0 @@
 var LANG = {
  en: {
    nav_overview: 'Overview',
    nav_port_config: 'Port Configuration',
    nav_port_stat: 'Port Statistics',
    nav_l2: 'L2 Configuration',
    nav_mirror: 'Mirroring',
    nav_lag: 'Link Aggregation',
    nav_eee: 'EEE',
    nav_bandwidth: 'Bandwidth Limits',
    nav_system: 'System Settings',
    nav_fw_update: 'Firmware Update',
    port_name: 'Name',
    port_status: 'Status',
    port_not_enabled: 'Not enabled.',
    port_link_speed: 'Link speed',
    port_vendor: 'Vendor',
    port_model: 'Model',
    port_serial: 'Serial',
    port_temp: 'Temp',
    port_vcc: 'Vcc',
    port_tx_fault: 'TX-Fault',
    port_tx_disabled: 'TX-Disabled',
    port_tx_bias: 'TX-Bias',
    port_tx_power: 'TX-Power',
    port_rx_power: 'RX-Power',
    port_rx_los: 'RX-LOS',
    speed_disabled: 'Disabled',
    speed_down: 'Down',
    port_title: 'FreeSwitchOS Port Configuration',
    port_heading: 'Port Configuration',
    port_col_port: 'Port',
    port_col_name: 'Name',
    port_col_speed: 'Current Link Speed',
    port_col_set_speed: 'Set Speed',
    port_col_disabled: 'Disabled',
    port_col_devices: 'Connected devices',
    port_devices: 'devices',
    port_col_apply: 'Apply',
    port_mtu_heading: 'Configure Maximum Frame Size (MTU) forwarded at Port',
    port_auto: 'Auto',
    port_2500m: '2500MBit/Full',
    port_1000m: '1000MBit/Full',
    port_100m_f: '100MBit/Full',
    port_100m_h: '100MBit/Half',
    port_10m_f: '10MBit/Full',
    port_10m_h: '10MBit/Half',
    port_apply: 'Apply',
    stat_title: 'FreeSwitchOS Port Statistics',
    stat_heading: 'Port Statistics',
    stat_detailed: 'Detailed Port Statistics',
    stat_close: 'Close',
    stat_col_port: 'Port',
    stat_col_name: 'Name',
    stat_col_link: 'link',
    stat_col_tx_good: 'TX Good',
    stat_col_tx_bad: 'TX Bad',
    stat_col_rx_good: 'RX Good',
    stat_col_rx_bad: 'RX Bad',
    stat_col_all: 'All Counters',
    stat_counter: 'Counter',
    stat_value: 'Value',
    stat_show: 'Show',
    vlan_title: 'FreeSwitchOS VLAN Configuration',
    vlan_heading: 'VLAN Configuration',
    vlan_select: 'VLAN Select:',
    vlan_choose: '— VLAN Choose —',
    vlan_id: 'VLAN ID:',
    vlan_get_config: 'Get Configuration',
    vlan_name: 'VLAN Name:',
    vlan_tagged: 'Tagged Ports',
    vlan_untagged: 'Untagged Ports',
    vlan_select_all: 'Select all',
    vlan_pvid: 'Use as default VLAN for incoming traffic (PVID)',
    vlan_update: 'Update / Create',
    vlan_configured: 'Configured VLANs',
    vlan_col_name: 'Name',
    vlan_col_member: 'Member Ports',
    vlan_col_tagged: 'Tagged Ports',
    vlan_col_untagged: 'Untagged Ports',
    vlan_col_pvid: 'PVID Ports',
    vlan_col_delete: 'Delete',
    vlan_set_id_first: 'Set VLAN ID first',
    vlan_delete_confirm: 'Delete VLAN ',
    lag_title: 'Link Aggregation Configuration',
    lag_heading: 'Link Aggregation Groups Configuration',
    lag_update: 'Update / Create',
    mirror_title: 'Mirror Configuration',
    mirror_heading: 'Mirror Configuration',
    mirror_enabled: 'Enabled:',
    mirror_port: 'Mirroring Port:',
    mirror_tx: 'Mirrored Ports (TX)',
    mirror_rx: 'Mirrored Ports (RX)',
    mirror_update: 'Update / Create',
    mirror_disable: 'Disable Mirroring',
    mirror_set_port_first: 'Set Mirroring Port first',
    mirror_select_ports: 'Select Mirrored Ports',
    eee_title: 'EEE Configuration',
    eee_heading: 'EEE Status',
    eee_advertising: 'Advertising',
    eee_partner: 'Link-Partner advertises',
    eee_port: 'Port',
    eee_active: 'Active?',
    eee_enable: 'Enable EEE',
    eee_disable: 'Disable EEE',
    eee_on: 'ON',
    eee_off: 'OFF',
    l2_title: 'FreeSwitchOS L2 Configuration',
    l2_heading: 'L2 Configuration',
    l2_col_port: 'Port',
    l2_col_type: 'Type',
    l2_col_remove: 'Remove Entry',
    l2_shown: 'Shown:',
    l2_delete: 'Delete',
    l2_static: 'static',
    l2_learned: 'learned',
    bw_title: 'Ingress and Egress Bandwidth',
    bw_heading: 'Ingress and Egress Bandwidth',
    bw_ingress: 'Ingress',
    bw_egress: 'Egress',
    bw_col_port: 'Port',
    bw_col_limit: 'Limit',
    bw_col_bandwidth: 'Bandwidth [kBit/s]',
    bw_col_flow: 'Flow Control',
    bw_col_apply: 'Apply',
    bw_unlimited: 'UNLIMITED',
    sys_title: 'System Settings',
    sys_tab_system: 'System',
    sys_tab_advanced: 'Advanced',
    sys_tab_console: 'Console',
    sys_heading: 'System Settings',
    sys_ip: 'IP address:',
    sys_model: 'Model:',
    sys_hostname: 'Hostname:',
    sys_apply: 'Apply',
    sys_netmask: 'Netmask:',
    sys_gateway: 'Gateway:',
    sys_language: 'Language:',
    sys_mgmt_vlan: 'Management VLAN:',
    sys_mgmt_untagged: 'untagged',
    sys_mgmt_confirm: 'Move switch management to VLAN ',
    sys_mgmt_warn: 'The switch will start tagging its own traffic with that VLAN. If the port you are connected through does not carry it, this page becomes unreachable and the setting can only be undone over the console. Continue?',
    sys_ip_note: 'When updating the above settings, remember to point your browser to the new IP afterwards:',
    sys_update: 'Update Settings',
    sys_save_label: 'Save all current settings to Flash:',
    sys_save: 'Save Settings to Flash',
    sys_advanced: 'Advanced Settings',
    sys_startup_config: 'Startup configuration:',
    sys_startup_warn: 'Be careful when saving the directly edited startup configuration, you can lock yourself out:',
    sys_clear_config: 'Clear Startup Config',
    sys_save_startup: 'Save Startup Settings to Flash',
    sys_reset: 'Reset Switch',
    sys_console: 'Console Command',
    sys_enter_cmd: 'Enter command:',
    sys_send_cmd: 'Send Command',
    sys_console_warn: 'Be careful when entering console commands, you can lock yourself out!',
    sys_invalid_ip: 'Invalid ip:',
    sys_reset_confirm: 'Are you sure you want to reset the switch?',
    sys_resetting: 'Switch is resetting. Please wait and refresh the page.',
    login_title: 'RTL Switch Login',
    login_heading: 'RTL Switch Login',
    login_wrong: 'Wrong password!',
    login_password: 'Password',
    login_login: 'Login',
    index_title: 'FreeSwitchOS Main Page',
    index_heading: 'Switch Configuration',
    index_settings: 'Settings',
    update_title: 'Firmware update',
    update_heading: 'Firmware Update',
    update_instruction: 'Choose a firmware update file to upload:',
    update_upload: 'Upload File',
    common_port: 'Port ',
    common_pkts: ' pkts',
  },
  ja: {
    nav_overview: '概要',
    nav_port_config: 'ポート設定',
    nav_port_stat: 'ポート統計',
    nav_l2: 'L2 設定',
    nav_mirror: 'ミラーリング',
    nav_lag: 'リンクアグリゲーション',
    nav_eee: 'EEE',
    nav_bandwidth: '帯域制限',
    nav_system: 'システム設定',
    nav_fw_update: 'ファームウェア更新',
    port_name: '名前',
    port_status: '状態',
    port_not_enabled: '無効',
    port_link_speed: 'リンク速度',
    port_vendor: 'ベンダー',
    port_model: 'モデル',
    port_serial: 'シリアル',
    port_temp: '温度',
    port_vcc: '電圧',
    port_tx_fault: 'TX 障害',
    port_tx_disabled: 'TX 無効',
    port_tx_bias: 'TX バイアス',
    port_tx_power: 'TX 電力',
    port_rx_power: 'RX 電力',
    port_rx_los: 'RX 信号ロス',
    speed_disabled: '無効',
    speed_down: 'リンクダウン',
    port_title: 'FreeSwitchOS ポート設定',
    port_heading: 'ポート設定',
    port_col_port: 'ポート',
    port_col_name: '名前',
    port_col_speed: '現在のリンク速度',
    port_col_set_speed: '速度設定',
    port_col_disabled: '無効',
    port_col_devices: '接続デバイス',
    port_devices: 'デバイス',
    port_col_apply: '適用',
    port_mtu_heading: 'ポートの最大フレームサイズ (MTU) 設定',
    port_auto: '自動',
    port_2500m: '2500Mbps/全二重',
    port_1000m: '1000Mbps/全二重',
    port_100m_f: '100Mbps/全二重',
    port_100m_h: '100Mbps/半二重',
    port_10m_f: '10Mbps/全二重',
    port_10m_h: '10Mbps/半二重',
    port_apply: '適用',
    stat_title: 'FreeSwitchOS ポート統計',
    stat_heading: 'ポート統計',
    stat_detailed: '詳細ポート統計',
    stat_close: '閉じる',
    stat_col_port: 'ポート',
    stat_col_name: '名前',
    stat_col_link: 'リンク',
    stat_col_tx_good: 'TX 正常',
    stat_col_tx_bad: 'TX 異常',
    stat_col_rx_good: 'RX 正常',
    stat_col_rx_bad: 'RX 異常',
    stat_col_all: '全カウンタ',
    stat_counter: 'カウンタ',
    stat_value: '値',
    stat_show: '表示',
    vlan_title: 'FreeSwitchOS VLAN 設定',
    vlan_heading: 'VLAN 設定',
    vlan_select: 'VLAN 選択:',
    vlan_choose: '— VLAN 選択 —',
    vlan_id: 'VLAN ID:',
    vlan_get_config: '設定取得',
    vlan_name: 'VLAN 名:',
    vlan_tagged: 'タグ付きポート',
    vlan_untagged: 'タグ無しポート',
    vlan_select_all: 'すべて選択',
    vlan_pvid: '受信トラフィックのデフォルト VLAN (PVID)',
    vlan_update: '更新 / 作成',
    vlan_configured: '設定済み VLAN',
    vlan_col_name: '名前',
    vlan_col_member: 'メンバーポート',
    vlan_col_tagged: 'タグ付きポート',
    vlan_col_untagged: 'タグ無しポート',
    vlan_col_pvid: 'PVID ポート',
    vlan_col_delete: '削除',
    vlan_set_id_first: 'VLAN ID を先に設定してください',
    vlan_delete_confirm: 'VLAN 削除 ',
    lag_title: 'リンクアグリゲーション設定',
    lag_heading: 'リンクアグリゲーショングループ設定',
    lag_update: '更新 / 作成',
    mirror_title: 'ミラーリング設定',
    mirror_heading: 'ミラーリング設定',
    mirror_enabled: '有効:',
    mirror_port: 'ミラーポート:',
    mirror_tx: 'ミラー元ポート (TX)',
    mirror_rx: 'ミラー元ポート (RX)',
    mirror_update: '更新 / 作成',
    mirror_disable: 'ミラーリング無効化',
    mirror_set_port_first: 'ミラーポートを先に設定してください',
    mirror_select_ports: 'ミラー元ポートを選択してください',
    eee_title: 'EEE 設定',
    eee_heading: 'EEE 状態',
    eee_advertising: 'EEE アドバタイジング',
    eee_partner: 'リンクパートナー広告',
    eee_port: 'ポート',
    eee_active: '有効?',
    eee_enable: 'EEE 有効化',
    eee_disable: 'EEE 無効化',
    eee_on: 'オン',
    eee_off: 'オフ',
    l2_title: 'FreeSwitchOS L2 設定',
    l2_heading: 'L2 設定',
    l2_col_port: 'ポート',
    l2_col_type: 'タイプ',
    l2_col_remove: 'エントリ削除',
    l2_shown: 'Shown:',
    l2_delete: '削除',
    l2_static: '静的',
    l2_learned: '学習',
    bw_title: '入力/出力帯域制限',
    bw_heading: '入力/出力帯域制限',
    bw_ingress: '入力',
    bw_egress: '出力',
    bw_col_port: 'ポート',
    bw_col_limit: '制限',
    bw_col_bandwidth: '帯域 [kbps]',
    bw_col_flow: 'フロー制御',
    bw_col_apply: '適用',
    bw_unlimited: '制限無し',
    sys_title: 'システム設定',
    sys_tab_system: 'システム',
    sys_tab_advanced: '詳細設定',
    sys_tab_console: 'コンソール',
    sys_heading: 'システム設定',
    sys_ip: 'IP アドレス:',
    sys_model: 'モデル:',
    sys_hostname: 'ホスト名:',
    sys_apply: '適用',
    sys_netmask: 'ネットマスク:',
    sys_gateway: 'ゲートウェイ:',
    sys_language: '言語:',
    sys_mgmt_vlan: 'Management VLAN:',
    sys_mgmt_untagged: 'untagged',
    sys_mgmt_confirm: 'Move switch management to VLAN ',
    sys_mgmt_warn: 'The switch will start tagging its own traffic with that VLAN. If the port you are connected through does not carry it, this page becomes unreachable and the setting can only be undone over the console. Continue?',
    sys_ip_note: '上記設定を変更した場合は、ブラウザで新しい IP にアクセスしてください:',
    sys_update: '設定更新',
    sys_save_label: '現在の設定をフラッシュに保存:',
    sys_save: '設定をフラッシュに保存',
    sys_advanced: '詳細設定',
    sys_startup_config: '起動設定:',
    sys_startup_warn: '起動設定を直接編集する際は注意してください。ロックアウトされる可能性があります:',
    sys_clear_config: '起動設定クリア',
    sys_save_startup: '起動設定をフラッシュに保存',
    sys_reset: 'スイッチ再起動',
    sys_console: 'コンソールコマンド',
    sys_enter_cmd: 'コマンド入力:',
    sys_send_cmd: 'コマンド送信',
    sys_console_warn: 'コンソールコマンドは注意して入力してください。ロックアウトされる可能性があります!',
    sys_invalid_ip: '無効な IP: ',
    sys_reset_confirm: 'スイッチを再起動してもよろしいですか？',
    sys_resetting: 'スイッチを再起動中です。しばらく待ってからページをリロードしてください。',
    login_title: 'RTL スイッチ ログイン',
    login_heading: 'RTL スイッチ ログイン',
    login_wrong: 'パスワードが違います!',
    login_password: 'パスワード',
    login_login: 'ログイン',
    index_title: 'FreeSwitchOS メインページ',
    index_heading: 'スイッチ設定',
    index_settings: '設定',
    update_title: 'ファームウェア更新',
    update_heading: 'ファームウェア更新',
    update_instruction: 'アップロードするファームウェアファイルを選択:',
    update_upload: 'ファイルをアップロード',
    common_port: 'ポート ',
    common_pkts: ' pkts',
  },
  zh: {
    nav_overview: '概览',
    nav_port_config: '端口配置',
    nav_port_stat: '端口统计',
    nav_l2: 'L2 配置',
    nav_mirror: '端口镜像',
    nav_lag: '链路聚合',
    nav_eee: 'EEE',
    nav_bandwidth: '带宽限制',
    nav_system: '系统设置',
    nav_fw_update: '固件升级',
    port_name: '名称',
    port_status: '状态',
    port_not_enabled: '未启用。',
    port_link_speed: '链路速率',
    port_vendor: '厂商',
    port_model: '型号',
    port_serial: '序列号',
    port_temp: '温度',
    port_vcc: '供电电压',
    port_tx_fault: 'TX 故障',
    port_tx_disabled: 'TX 禁用',
    port_tx_bias: 'TX 偏置电流',
    port_tx_power: 'TX 光功率',
    port_rx_power: 'RX 光功率',
    port_rx_los: 'RX 信号丢失',
    speed_disabled: '禁用',
    speed_down: '未连接',
    port_title: 'FreeSwitchOS 端口配置',
    port_heading: '端口配置',
    port_col_port: '端口',
    port_col_name: '名称',
    port_col_speed: '当前链路速率',
    port_col_set_speed: '设置速率',
    port_col_disabled: '禁用',
    port_col_devices: '已连接设备',
    port_devices: '台设备',
    port_col_apply: '应用',
    port_mtu_heading: '配置端口转发的最大帧大小 (MTU)',
    port_auto: '自动',
    port_2500m: '2500Mbps/全双工',
    port_1000m: '1000Mbps/全双工',
    port_100m_f: '100Mbps/全双工',
    port_100m_h: '100Mbps/半双工',
    port_10m_f: '10Mbps/全双工',
    port_10m_h: '10Mbps/半双工',
    port_apply: '应用',
    stat_title: 'FreeSwitchOS 端口统计',
    stat_heading: '端口统计',
    stat_detailed: '详细端口统计',
    stat_close: '关闭',
    stat_col_port: '端口',
    stat_col_name: '名称',
    stat_col_link: '链路',
    stat_col_tx_good: 'TX 正常包',
    stat_col_tx_bad: 'TX 错误包',
    stat_col_rx_good: 'RX 正常包',
    stat_col_rx_bad: 'RX 错误包',
    stat_col_all: '所有计数器',
    stat_counter: '计数器',
    stat_value: '值',
    stat_show: '查看',
    vlan_title: 'FreeSwitchOS VLAN 配置',
    vlan_heading: 'VLAN 配置',
    vlan_select: 'VLAN 选择:',
    vlan_choose: '-- 请选择 VLAN --',
    vlan_id: 'VLAN ID:',
    vlan_get_config: '获取配置',
    vlan_name: 'VLAN 名称:',
    vlan_tagged: 'Tagged 端口',
    vlan_untagged: 'Untagged 端口',
    vlan_select_all: '全选',
    vlan_pvid: '作为入方向流量的默认 VLAN (PVID)',
    vlan_update: '更新 / 创建',
    vlan_configured: '已配置 VLAN',
    vlan_col_name: '名称',
    vlan_col_member: '成员端口',
    vlan_col_tagged: 'Tagged 端口',
    vlan_col_untagged: 'Untagged 端口',
    vlan_col_pvid: 'PVID 端口',
    vlan_col_delete: '删除',
    vlan_set_id_first: '请先设置 VLAN ID',
    vlan_delete_confirm: '删除 VLAN ',
    lag_title: '链路聚合配置',
    lag_heading: '链路聚合组配置',
    lag_update: '更新 / 创建',
    mirror_title: '端口镜像配置',
    mirror_heading: '端口镜像配置',
    mirror_enabled: '启用:',
    mirror_port: '镜像目的端口:',
    mirror_tx: '被镜像端口 (TX)',
    mirror_rx: '被镜像端口 (RX)',
    mirror_update: '更新 / 创建',
    mirror_disable: '禁用端口镜像',
    mirror_set_port_first: '请先设置镜像目的端口',
    mirror_select_ports: '请选择被镜像端口',
    eee_title: 'EEE 配置',
    eee_heading: 'EEE 状态',
    eee_advertising: '本端通告',
    eee_partner: '链路伙伴通告',
    eee_port: '端口',
    eee_active: '已生效?',
    eee_enable: '启用 EEE',
    eee_disable: '禁用 EEE',
    eee_on: '开',
    eee_off: '关',
    l2_title: 'FreeSwitchOS L2 配置',
    l2_heading: 'L2 配置',
    l2_col_port: '端口',
    l2_col_type: '类型',
    l2_col_remove: '删除条目',
    l2_shown: 'Shown:',
    l2_delete: '删除',
    l2_static: '静态',
    l2_learned: '动态学习',
    bw_title: '入方向/出方向带宽限制',
    bw_heading: '入方向/出方向带宽限制',
    bw_ingress: '入方向',
    bw_egress: '出方向',
    bw_col_port: '端口',
    bw_col_limit: '限速',
    bw_col_bandwidth: '带宽 [kbit/s]',
    bw_col_flow: '流量控制',
    bw_col_apply: '应用',
    bw_unlimited: '不限速',
    sys_title: '系统设置',
    sys_tab_system: '系统',
    sys_tab_advanced: '高级',
    sys_tab_console: '控制台',
    sys_heading: '系统设置',
    sys_ip: 'IP 地址:',
    sys_model: '型号:',
    sys_hostname: '主机名:',
    sys_apply: '应用',
    sys_netmask: '子网掩码:',
    sys_gateway: '网关:',
    sys_language: '语言:',
    sys_mgmt_vlan: 'Management VLAN:',
    sys_mgmt_untagged: 'untagged',
    sys_mgmt_confirm: 'Move switch management to VLAN ',
    sys_mgmt_warn: 'The switch will start tagging its own traffic with that VLAN. If the port you are connected through does not carry it, this page becomes unreachable and the setting can only be undone over the console. Continue?',
    sys_ip_note: '更新上述设置后，请使用新的 IP 地址重新访问管理界面:',
    sys_update: '更新设置',
    sys_save_label: '将当前全部设置保存到 Flash:',
    sys_save: '保存设置到 Flash',
    sys_advanced: '高级设置',
    sys_startup_config: '启动配置:',
    sys_startup_warn: '直接编辑启动配置时请谨慎，错误配置可能导致无法访问设备:',
    sys_clear_config: '清除启动配置',
    sys_save_startup: '保存启动配置到 Flash',
    sys_reset: '重启交换机',
    sys_console: '控制台命令',
    sys_enter_cmd: '输入命令:',
    sys_send_cmd: '发送命令',
    sys_console_warn: '输入控制台命令时请谨慎，错误命令可能导致无法访问设备!',
    sys_invalid_ip: '无效 IP: ',
    sys_reset_confirm: '确定要重启交换机吗?',
    sys_resetting: '交换机正在重启。请稍候并刷新页面。',
    login_title: 'RTL 交换机登录',
    login_heading: 'RTL 交换机登录',
    login_wrong: '密码错误!',
    login_password: '密码',
    login_login: '登录',
    index_title: 'FreeSwitchOS 主页',
    index_heading: '交换机配置',
    index_settings: '设置',
    update_title: '固件升级',
    update_heading: '固件升级',
    update_instruction: '请选择要上传的固件文件:',
    update_upload: '上传文件',
    common_port: '端口 ',
    common_pkts: ' 个包',
  }
 };
 var rtlLang = (function() {
  var saved = localStorage.getItem('rtl_lang');
  if (saved && LANG[saved]) return saved;
  var browser = (navigator.language || navigator.userLanguage || 'en').substring(0, 2);
  return LANG[browser] ? browser : 'en';
 })();
 function t(key) {
  return LANG[rtlLang][key] || LANG['en'][key] || key;
 }
 function setLang(lang) {
  if (LANG[lang]) {
    localStorage.setItem('rtl_lang', lang);
    rtlLang = lang;
    document.querySelectorAll('[data-i18n]').forEach(function(el) {
      applyTranslation(el);
    });
  }
 }
 function applyTranslation(el) {
  var key = el.getAttribute('data-i18n');
  if (!key) return;
  if (el.tagName === 'INPUT' && (el.type === 'submit' || el.type === 'button')) {
    el.value = t(key);
  } else if (el.tagName === 'OPTION') {
    el.textContent = t(key);
  } else if (el.tagName === 'TITLE') {
    el.textContent = t(key);
  } else {
    el.innerHTML = t(key);
  }
 }
 document.addEventListener('DOMContentLoaded', function() {
  document.querySelectorAll('[data-i18n]').forEach(function(el) {
    applyTranslation(el);
  });
 });
@@ -2,7 +2,6 @@
 <html>
  <script src="/main.js"></script>
  <script src="/main_info.js"></script>
  <script src="/i18n.js"></script>
  <script>
  window.addEventListener("load", function() {
    update( () => {
@@ -11,17 +10,17 @@
  });
  </script>
  <link rel="stylesheet" href="style.css">
-  <title data-i18n="index_title">FreeSwitchOS Main Page</title>
+  <title>FreeSwitchOS Main Page</title>
 </head>
 <body>
  <nav id="sidebar"></nav>
  <div style="margin-left:16%;padding:1px 16px;height:1000px;">
    <div id="ports"></div>
-    <h1 data-i18n="index_heading">Switch Configuration</h1>
+    <h1>Switch Configuration</h1>
    <table id="infoTable">
      <tr>
-        <th colspan="2" data-i18n="index_settings">Settings</th>
+        <th colspan="2">Settings</th>
      </tr>
      <tbody>
      </tbody>
@@ -1,27 +1,16 @@
 <!DOCTYPE html>
 <html>
  <script src="/main.js"></script>
  <script src="/i18n.js"></script>
  <link rel="stylesheet" href="style.css">
-  <title data-i18n="l2_title">FreeSwitchOS L2 Configuration</title>
+  <title>FreeSwitchOS L2 Configuration</title>
  </head>
  <body>
    <nav id="sidebar"></nav>
    <div style="margin-left:16%;padding:1px 16px;height:1000px;">
    <div id="ports"></div>
-    <h1 data-i18n="l2_heading">L2 Configuration</h1>
+    <h1>L2 Configuration</h1>
    <p><span data-i18n="l2_shown">Shown:</span> <span id="l2count">-</span></p>
    <table id="l2table">
-      <tr>
+      <tr> <th>Port</th> <th>MAC</th> <th>VLAN</th> <th>Type</th> <th>Remove Entry</th></tr>
        <th><span class="l2sort" onclick="l2SortBy('port')"><span data-i18n="l2_col_port">Port</span><span id="l2a_port" class="l2arrow"></span></span><br>
            <input id="l2f_port" class="l2filter" oninput="l2FilterChanged()" size="5"></th>
        <th><span class="l2sort" onclick="l2SortBy('mac')">MAC<span id="l2a_mac" class="l2arrow"></span></span><br>
            <input id="l2f_mac" class="l2filter" oninput="l2FilterChanged()" size="14"></th>
        <th><span class="l2sort" onclick="l2SortBy('vlan')">VLAN<span id="l2a_vlan" class="l2arrow"></span></span><br>
            <input id="l2f_vlan" class="l2filter" oninput="l2FilterChanged()" size="5"></th>
        <th><span class="l2sort" onclick="l2SortBy('type')"><span data-i18n="l2_col_type">Type</span><span id="l2a_type" class="l2arrow"></span></span><br>
            <input id="l2f_type" class="l2filter" oninput="l2FilterChanged()" size="8"></th>
        <th data-i18n="l2_col_remove">Remove Entry</th></tr>
      <script src="/l2.js"></script>
    </table>
    </div>
@@ -1,3 +1,7 @@
 var l2GetInterval;
 var l2Entries = [];
 var l2CurrentEntry = 0;
 function fillStats() {
  var tbl = document.getElementById('statstable');
  if (!numPorts)
@@ -5,22 +9,22 @@ function fillStats() {
  if (tbl.rows.length > 1) {
    for (let i = 0; i < numPorts; i++) {
      console.log("Table Update row: " + i + " state " + pState[i] + " is " + linkS[pState[i] +1]);
-      tbl.rows[i+1].cells[1].innerHTML = linkText(pState[i]+1);
+      tbl.rows[i+1].cells[1].innerHTML = `${linkS[pState[i]+1]}`;
-      tbl.rows[i+1].cells[2].innerHTML = `${txG[i]}` + t('common_pkts');
+      tbl.rows[i+1].cells[2].innerHTML = `${txG[i]} pkts`;
-      tbl.rows[i+1].cells[3].innerHTML = `${txB[i]}` + t('common_pkts');
+      tbl.rows[i+1].cells[3].innerHTML = `${txB[i]} pkts`;
-      tbl.rows[i+1].cells[4].innerHTML = `${rxG[i]}` + t('common_pkts');
+      tbl.rows[i+1].cells[4].innerHTML = `${rxG[i]} pkts`;
-      tbl.rows[i+1].cells[5].innerHTML = `${rxB[i]}` + t('common_pkts');
+      tbl.rows[i+1].cells[5].innerHTML = `${rxB[i]} pkts`;
    }
  } else {
    for (let i = 0; i < numPorts; i++) {
      console.log("Table row: " + i);
      const tr = tbl.insertRow();
-      let td = tr.insertCell(); td.appendChild(document.createTextNode(t('common_port') + (i+1)));
+      let td = tr.insertCell(); td.appendChild(document.createTextNode(`Port ${i+1}`));
-      td = tr.insertCell(); td.appendChild(document.createTextNode(linkText(pState[i]+1)));
+      td = tr.insertCell(); td.appendChild(document.createTextNode(`${linkS[pState[i]+1]}`));
-      td = tr.insertCell(); td.appendChild(document.createTextNode(`${txG[i]}` + t('common_pkts')));
+      td = tr.insertCell(); td.appendChild(document.createTextNode(`${txG[i]} pkts`));
-      td = tr.insertCell();td.appendChild(document.createTextNode(`${txB[i]}` + t('common_pkts')));
+      td = tr.insertCell();td.appendChild(document.createTextNode(`${txB[i]} pkts`));
-      td = tr.insertCell();td.appendChild(document.createTextNode(`${rxG[i]}` + t('common_pkts')));
+      td = tr.insertCell();td.appendChild(document.createTextNode(`${rxG[i]} pkts`));
-      td = tr.insertCell();td.appendChild(document.createTextNode(`${rxB[i]}` + t('common_pkts')));
+      td = tr.insertCell();td.appendChild(document.createTextNode(`${rxB[i]} pkts`));
    }
  }
 }
@@ -60,51 +64,6 @@ function delL2(idx) {
  xhttp.timeout = 1500; xhttp.send();
 }
 var l2All = [];
 const l2Cols = ['port', 'mac', 'vlan', 'type'];
 var l2SortCol = 'port';
 var l2SortDir = 1;
 function l2Key(e, col) {
  if (col === 'port') return e.port === 'CPU' ? Number.MAX_SAFE_INTEGER : Number(e.port);
  if (col === 'vlan') return Number(e.vlan);
  return String(e[col]).toLowerCase();
 }
 function l2SortBy(col) {
  l2SortDir = (col === l2SortCol) ? -l2SortDir : 1;
  l2SortCol = col;
  renderL2();
 }
 function l2FilterChanged() { renderL2(); }
 function renderL2() {
  var tbl = document.getElementById('l2table');
  if (!tbl) return;
  var f = {};
  l2Cols.forEach(function(c) {
    var el = document.getElementById('l2f_' + c);
    f[c] = el ? el.value.trim().toLowerCase() : '';
  });
  var rows = l2All.filter(function(e) {
    return l2Cols.every(function(c) {
      return !f[c] || String(e[c]).toLowerCase().indexOf(f[c]) !== -1;
    });
  });
  rows.sort(function(a, b) {
    var x = l2Key(a, l2SortCol), y = l2Key(b, l2SortCol);
    return (x < y ? -1 : x > y ? 1 : 0) * l2SortDir;
  });
  l2Cols.forEach(function(c) {
    var a = document.getElementById('l2a_' + c);
    if (a) a.textContent = (c === l2SortCol) ? (l2SortDir > 0 ? ' \u25b2' : ' \u25bc') : ' \u21c5';
  });
  paintL2(tbl, rows);
  var cnt = document.getElementById('l2count');
  if (cnt) cnt.textContent = rows.length + ' / ' + l2All.length;
 }
 function fillL2(s)
 {
  var tbl = document.getElementById('l2table');
@@ -112,12 +71,7 @@ function fillL2(s)
    return;
  s.sort(l2CMP);
  s = uniq(s);
-  l2All = s;
+  var s = s.map(function(e) { e.port = e.port != 9 ? e.port : "CPU"; return e; });
  renderL2();
 }
 function paintL2(tbl, s)
 {
  console.log("L2: ", JSON.stringify(s));
  for (let i = 0; i < s.length; i++) {
    var e = s[i];
@@ -126,36 +80,64 @@ function paintL2(tbl, s)
      tbl.rows[i+1].cells[0].innerHTML = `${e.port}`;
      tbl.rows[i+1].cells[1].innerHTML = `${e.mac}`;
      tbl.rows[i+1].cells[2].innerHTML = `${e.vlan}`;
-      tbl.rows[i+1].cells[3].innerHTML = `${e.type}`;
+      tbl.rows[i+1].cells[4].innerHTML = '<button type="button" onclick="delL2(' + e.idx + ');">Delete</button>';
      tbl.rows[i+1].cells[4].innerHTML = '<button type="button" onclick="delL2(' + e.idx + ');">' + t('l2_delete') + '</button>';
    } else {
      const tr = tbl.insertRow();
      let td = tr.insertCell(); td.innerHTML = `${e.port}`;
      td = tr.insertCell(); td.innerHTML = `${e.mac}`;
      td = tr.insertCell(); td.innerHTML = `${e.vlan}`;
      td = tr.insertCell(); td.innerHTML = `${e.type}`;
-      td = tr.insertCell(); td.innerHTML = '<button type="button" onclick="delL2(' + e.idx + ');">' + t('l2_delete') + '</button>';
+      td = tr.insertCell(); td.innerHTML = '<button type="button" onclick="delL2(' + e.idx + ');">Delete</button>';
    }
  }
  for (let i = tbl.rows.length - 1; i > s.length; i--)
    tbl.deleteRow(i);
  l2Entries = [];
 }
 function getL2() {
-  walkL2(function(entries, ok) {
+  var xhttp = new XMLHttpRequest();
-    if (ok) {
+  xhttp.onreadystatechange = function() {
-      for (var i = 0; i < entries.length; i++)
+    if (this.readyState == 4 && this.status == 200) {
-        entries[i].type = entries[i].type == "s" ? t('l2_static') : t('l2_learned');
+      var s = JSON.parse(xhttp.responseText);
-      fillL2(entries);
+      var s = s.map(function(e) { 
        e.vlan = parseInt(e.vlan, 16);
        e.idx = parseInt(e.idx, 16);
        e.type = e.type == "s" ? "static" : "learned";
        e.port = e.port == 9 ? 9 : logToPhysPort[e.port];
      return e;
    });
      l2Entries.push(...s);
      if (l2Entries >= 4096) {
        l2Entries = [];
        l2CurrentEntry = 0;
        clearInterval(l2GetInterval);
        return;
      }
      var w = 0;
      for (var i = l2Entries.length-1; i > 0; i--) {
        if (l2Entries[0].idx == l2Entries[i].idx) {
          w = 1;
          break;
        }
      }
      if (w) {
        l2CurrentEntry = 0; 
        fillL2(l2Entries);
      } else {
        l2CurrentEntry = s[s.length-1].idx + 1;
      }
    }
-    setTimeout(getL2, 1000);
+  };
-  });
+  xhttp.open("GET", "/l2.json?idx=" + l2CurrentEntry, true);
  xhttp.timeout = 1500; sendXHTTP(xhttp);
 }
 window.addEventListener("load", function() {
  update( () => {
    getL2();
    const interval = setInterval(update, 2000);
    l2GetInterval = setInterval(getL2, 1000);
  });;
 });
@@ -1,25 +1,24 @@
 <!DOCTYPE html>
 <html>
  <script src="/main.js"></script>
  <script src="/i18n.js"></script>
  <link rel="stylesheet" href="style.css">
-  <title data-i18n="lag_title">Link Aggregation Configuration</title>
+  <title>Link Aggregation Configuration</title>
  </head>
  <body>
    <nav id="sidebar"></nav>
    <div style="margin-left:16%;padding:1px 16px;height:1000px;">
    <div id="ports"></div>
-    <h1 data-i18n="lag_heading">Link Aggregation Groups Configuration</h1>
+    <h1>Link Aggregation Groups Configuration</h1>
-    <h2>LAG 1 <input style="width:15%;margin-left: 3em;" class="action" id="l_sub0" onclick="lagSub(0);" type="button" data-i18n="lag_update" value="Update / Create"></h2>
+    <h2>LAG 1 <input style="width:15%;margin-left: 3em;" class="action" id="l_sub0" onclick="lagSub(0);" type="button" value="Update / Create"></h2>
    <div id="mLAG0"></div>
    <br />
-    <h2>LAG 2 <input style="width:15%;margin-left: 3em;" class="action" id="l_sub1" onclick="lagSub(1);" type="button" data-i18n="lag_update" value="Update / Create"></h2>
+    <h2>LAG 2 <input style="width:15%;margin-left: 3em;" class="action" id="l_sub1" onclick="lagSub(1);" type="button" value="Update / Create"></h2>
    <div id="mLAG1"></div>
    <br />
-    <h2>LAG 3 <input style="width:15%;margin-left: 3em;" class="action" id="l_sub2" onclick="lagSub(2);" type="button" data-i18n="lag_update" value="Update / Create"></h2>
+    <h2>LAG 3 <input style="width:15%;margin-left: 3em;" class="action" id="l_sub2" onclick="lagSub(2);" type="button" value="Update / Create"></h2>
    <div id="mLAG2"></div>
    <br />
-    <h2>LAG 4 <input style="width:15%;margin-left: 3em;" class="action" id="l_sub3" onclick="lagSub(3);" type="button" data-i18n="lag_update" value="Update / Create"></h2>
+    <h2>LAG 4 <input style="width:15%;margin-left: 3em;" class="action" id="l_sub3" onclick="lagSub(3);" type="button" value="Update / Create"></h2>
    <div id="mLAG3"></div>
    <script src="/lag.js"></script>
    </div>
@@ -1,30 +1,30 @@
 <!DOCTYPE html>
 <html>
-  <title data-i18n="login_title">RTL Switch Login</title>
+  <title>RTL Switch Login</title>
  <link rel="stylesheet" href="style.css">
  <script src="/i18n.js"></script>
  <script>
    function removeNote() {
      document.getElementById("incorrect").innerHTML = "";
    }
    window.addEventListener("load", function() {
      if (document.referrer.endsWith("login.html"))
-        document.getElementById("incorrect").innerHTML = t('login_wrong');
+      document.getElementById("incorrect").innerHTML = "Wrong password!";
    });
-  </script>
+    </script>
 </head>
 <body class="login_page">
  <div class = "center">
-  <h1 data-i18n="login_heading"> RTL Switch Login</h1>
+  <h1> RTL Switch Login</h1>
  <form method="post" action="login">
  <div class="txt_field">
-    <input name="pwd" type="password" autocomplete="current-password" onclick="removeNote()" required />
+    <input name="pwd" type="password" onclick="removeNote()" required />
    <span></span>
-    <label data-i18n="login_password">Password</label>
+    <label>Password</label>
  </div>
-  <input type="submit" data-i18n="login_login" value="Login"/>
+  <input type="submit" value="Login"/>
  <h3 id="incorrect" style="margin-top: 5em;"></h3>
  </form>
 </body>
 </html>
@@ -2,12 +2,11 @@ var txG = new BigInt64Array(10);
 var txB = new BigInt64Array(10);
 var rxG = new BigInt64Array(10);
 var rxB = new BigInt64Array(10);
-const linkS = [function(){return t('speed_disabled')}, function(){return t('speed_down')}, "10M", "100M", "1000M", "500M", "10G", "2.5G", "5G"];
+const linkS = ["Disabled", "Down", "10M", "100M", "1000M", "500M", "10G", "2.5G", "5G"];
 var pState = new Int8Array(10);
 var pIsSFP = new Int8Array(10);
 var pAdvertised = new Int8Array(10);
 var numPorts = 0;
 function linkText(idx) { var v = linkS[idx]; return typeof v === 'function' ? v() : v; }
 var logToPhysPort = new Int8Array(10);
 var physToLogPort = new Int8Array(10);
 var portNames = new Array(10);
@@ -22,7 +21,7 @@ function drawPorts() {
    d.classList.add('tooltip');
    const s = document.createElement("span");
    s.classList.add("tooltiptext");
-    s.innerHTML = t('common_port');
+    s.innerHTML = "Tooltip text";
    s.id="tt_" + (i+1);
    const l = document.createElement("object");
    d.appendChild(l);
@@ -153,21 +152,19 @@ function update(callback) {
          continue;
 	const portName = p.name || portNames[p.logPort] || '';
 	var iHTML = "<table border=\"0\" class=\"tt_table\">";
-	if (portName) iHTML += "<tr><td align=\"left\">" + t('port_name') + "</td><td>:</td><td>" + portName + "</td></tr>";
+	if (portName) iHTML += "<tr><td align=\"left\">Name</td><td>:</td><td>" + portName + "</td></tr>";
 	if (p.enabled == 0) {
 	  pState[n] = -1;
 	  bgs[0].style.fill = "red";
 	  leds[0].style.fill = "black"; leds[1].style.fill = "black";
 	  psvg.style.opacity = 0.4;
-	  iHTML += "<tr><td align=\"left\">" + t('port_status') + "</td><td>:</td><td>" + t('port_not_enabled') + "</td></tr>";
+	  iHTML += "<tr><td align=\"left\">Status</td><td>:</td><td>Not enabled.</td></tr>";
 	  iHTML += "</table>";
 	  tt.innerHTML = iHTML;
 	} else {
 	  psvg.style.opacity = 1.0;
 	  pState[n] = p.link;
-	  if (p.link == 5 || p.link == 7) {
+	  if (p.link == 4 || p.link == 5 || p.link == 6) {
 	    leds[0].style.fill = "green"; leds[1].style.fill = "blue";
 	  } else if (p.link == 4 || p.link == 6) {
 	    leds[0].style.fill = "green"; leds[1].style.fill = "orange";
 	  } else if (p.link == 1 || p.link == 2 || p.link == 3) {
 	    leds[0].style.fill = "green"; leds[1].style.fill = "green";
@@ -175,31 +172,31 @@ function update(callback) {
 	    leds[0].style.fill = "black"; leds[1].style.fill = "black";
 	    psvg.style.opacity = 0.4
 	  }
-	  iHTML += "<tr><td align=\"left\">" + t('port_link_speed') + "</td><td>:</td><td>" + linkText(p.link + 1) + "</td></tr>";
+	  iHTML += "<tr><td align=\"left\">Link speed</td><td>:</td><td>" + linkS[p.link + 1] + "</td></tr>";
 	  if (p.isSFP) {
 	    pAdvertised[n] = 0;
 	    const hasExtendedStatus = p.sfp_options & 0x40;
-	    iHTML += "<tr><td>" + t('port_vendor') + "</td><td>:</td><td>" + p.sfp_vendor + "</td></tr>";
+	    iHTML += "<tr><td>Vendor</td><td>:</td><td>" + p.sfp_vendor + "</td></tr>";
-	    iHTML += "<tr><td>" + t('port_model') + "</td><td>:</td><td>" + p.sfp_model + "</td></tr>";
+	    iHTML += "<tr><td>Model</td><td>:</td><td>" + p.sfp_model + "</td></tr>";
-	    iHTML += "<tr><td>" + t('port_serial') + "</td><td>:</td><td>" + p.sfp_serial + "</td></tr>";
+	    iHTML += "<tr><td>Serial</td><td>:</td><td>" + p.sfp_serial + "</td></tr>";
 	    if (hasExtendedStatus) {
 	      let txPower = decodeSfpTxPower(p.sfp_txpower, p.sfp_txpower_cal);
 	      let txPowerdBm = convertPowerTodBm(txPower);
 	      let rxPower = decodeSfpRxPower(p.sfp_rxpower, p.sfp_rxpower_cal);
 	      let rxPowerdBm = convertPowerTodBm(rxPower);
-	      iHTML += "<tr><td>" + t('port_temp') + "</td><td>:</td><td>" + decodeSfpTemp(p.sfp_temp, p.sfp_temp_cal).toFixed(2) + "&#8239;&#8451;</td></tr>";
+	      iHTML += "<tr><td>Temp</td><td>:</td><td>" + decodeSfpTemp(p.sfp_temp, p.sfp_temp_cal).toFixed(2) + "&#8239;&#8451;</td></tr>";
-	      iHTML += "<tr><td>" + t('port_vcc') + "</td><td>:</td><td>" + decodeSfpVcc(p.sfp_vcc, p.sfp_vcc_cal).toFixed(2) + "&#8239;V</td></tr>";
+	      iHTML += "<tr><td>Vcc</td><td>:</td><td>" + decodeSfpVcc(p.sfp_vcc, p.sfp_vcc_cal).toFixed(2) + "&#8239;V</td></tr>";
-	      iHTML += "<tr><td>" + t('port_tx_fault') + "</td><td>:</td><td>" + (Boolean(Number(p.sfp_state) & 0x4)) + "</td></tr>";
+	      iHTML += "<tr><td>TX-Fault</td><td>:</td><td>" + (Boolean(Number(p.sfp_state) & 0x4)) + "</td></tr>";
-	      iHTML += "<tr><td>" + t('port_tx_disabled') + "</td><td>:</td><td>" + (Boolean(Number(p.sfp_state) & 0x80)) + "</td></tr>";
+	      iHTML += "<tr><td>TX-Disabled</td><td>:</td><td>" + (Boolean(Number(p.sfp_state) & 0x80)) + "</td></tr>";
-	      iHTML += "<tr><td>" + t('port_tx_bias') + "</td><td>:</td><td>" + decodeSfpTxBias(p.sfp_txbias, p.sfp_txbias_cal).toFixed(1) + "&#8239;mA</td></tr>";
+	      iHTML += "<tr><td>TX-Bias</td><td>:</td><td>" + decodeSfpTxBias(p.sfp_txbias, p.sfp_txbias_cal).toFixed(1) + "&#8239;mA</td></tr>";
-	      iHTML += "<tr><td>" + t('port_tx_power') + "</td><td>:</td><td>" + txPower.toFixed(3) + "&#8239;mW / " + txPowerdBm.toFixed(2) + "&#8239;dBm</td></tr>";
+	      iHTML += "<tr><td>TX-Power</td><td>:</td><td>" + txPower.toFixed(3) + "&#8239;mW / " + txPowerdBm.toFixed(2) + "&#8239;dBm</td></tr>";
-	      iHTML += "<tr><td>" + t('port_rx_power') + "</td><td>:</td><td>" + rxPower.toFixed(3) + "&#8239;mW / " + rxPowerdBm.toFixed(2) + "&#8239;dBm</td></tr>";
+	      iHTML += "<tr><td>RX-Power</td><td>:</td><td>" + rxPower.toFixed(3) + "&#8239;mW / " + rxPowerdBm.toFixed(2) + "&#8239;dBm</td></tr>";
 	    }
 	    // Not all devices & modules have LOS pin...
 	    const rx_los_pin = p.sfp_los !== null ? Boolean(Number(p.sfp_los)) : null;
 	    const rx_los_module = hasExtendedStatus ? Boolean(Number(p.sfp_state) & 0x2) : null;
 	    if (rx_los_module !== null || rx_los_pin !== null) {
-	      iHTML += `<tr><td>` + t('port_rx_los') + `</td><td>:</td><td>${rxLosHTML(rx_los_pin, rx_los_module)}</td></tr>`;
+	      iHTML += `<tr><td>RX-LOS</td><td>:</td><td>${rxLosHTML(rx_los_pin, rx_los_module)}</td></tr>`;
 	    }
 	  } else {
 	    pAdvertised[n] = parseInt(p.adv, 2);
@@ -285,66 +282,3 @@ function sendXHTTP(x)
  currentRequests.push(x);
 }
 function walkL2(onDone)
 {
  var entries = [];
  var idx = 0;
  var tries = 0;
  function retry() {
    if (++tries < 3) {
      setTimeout(page, 1000);
      return;
    }
    onDone(entries, false);
  }
  function page() {
    var xhttp = new XMLHttpRequest();
    xhttp.onreadystatechange = function() {
      if (this.readyState != 4)
        return;
      if (this.status != 200) {
        retry();
        return;
      }
      var s;
      try {
        s = JSON.parse(xhttp.responseText);
      } catch (err) {
        retry();
        return;
      }
      tries = 0;
      s = s.map(function(e) {
        e.vlan = parseInt(e.vlan, 16);
        e.idx = parseInt(e.idx, 16);
        e.port = e.port == 9 ? 'CPU' : logToPhysPort[e.port];
        return e;
      });
      if (!s.length) {
        onDone(entries, true);
        return;
      }
      entries.push(...s);
      for (var i = entries.length - 1; i > 0; i--) {
        if (entries[0].idx == entries[i].idx) {
          onDone(entries, true);
          return;
        }
      }
      if (entries.length >= 4096) {
        onDone(entries, true);
        return;
      }
      idx = s[s.length - 1].idx + 1;
      setTimeout(page, 1000);
    };
    xhttp.open("GET", "/l2.json?idx=" + idx, true);
    xhttp.timeout = 1500;
    sendXHTTP(xhttp);
  }
  page();
 }
@@ -1,24 +1,23 @@
 <!DOCTYPE html>
 <html>
  <script src="/main.js"></script>
  <script src="/i18n.js"></script>
  <link rel="stylesheet" href="style.css">
-  <title data-i18n="mirror_title">Mirror Configuration</title>
+  <title>Mirror Configuration</title>
  </head>
  <body>
    <nav id="sidebar"></nav>
    <div style="margin-left:16%;padding:1px 16px;height:1000px;">
    <div id="ports"></div>
-    <h1 data-i18n="mirror_heading">Mirror Configuration</h1>
+    <h1>Mirror Configuration</h1>
-    <label class="tswitch"><span data-i18n="mirror_enabled">Enabled:</span> <input id="me" type="checkbox"></label><br/>
+    <label class="tswitch">Enabled: <input id="me" type="checkbox"></label><br/>
-    <label for="mp"><span data-i18n="mirror_port">Mirroring Port:</span></label> <input type="number" id="mp" name="mp" min="1" max="9"/>
+    <label for="mp">Mirroring Port:</label> <input type="number" id="mp" name="mp" min="1" max="9"/>
-    <h2 data-i18n="mirror_tx">Mirrored Ports (TX)</h2>
+    <h2>Mirrored Ports (TX)</h2>
    <div id="mPortsTX"></div>
    <br />
-    <h2 data-i18n="mirror_rx">Mirrored Ports (RX)</h2>
+    <h2>Mirrored Ports (RX)</h2>
    <div id="mPortsRX"></div>
-    <br/> <input style="width:15%;" class="action" id="mirror_sub" onclick="mirrorSub();" type="button" data-i18n="mirror_update" value="Update / Create">
+    <br/> <input style="width:15%;" class="action" id="mirror_sub" onclick="mirrorSub();" type="button" value="Update / Create">
-    <input style="width:15%;" class="action" id="mirror_del" onclick="mirrorDel();" type="button" data-i18n="mirror_disable" value="Disable Mirroring">
+    <input style="width:15%;" class="action" id="mirror_del" onclick="mirrorDel();" type="button" value="Disable Mirroring">
    <script src="/mirror.js"></script>
    <script src="/mirror_sub.js"></script>
    </div>
@@ -2,7 +2,7 @@ async function mirrorSub() {
  var cmd = "mirror ";
  var mp=document.getElementById('mp').value
  if (!mp) {
-    alert(t('mirror_set_port_first'));
+    alert("Set Mirroring Port first");
    return;
  }
  document.getElementById(mirrors[0]+mp).checked=false;document.getElementById(mirrors[1]+mp).checked=false;
@@ -16,7 +16,7 @@ async function mirrorSub() {
      cmd = cmd + ` ${i}r`;
  }
  if (cmd.length < 10) {
-    alert(t('mirror_select_ports'));
+    alert("Select Mirrored Ports");
    return;
  }
  try {
@@ -1,21 +1,12 @@
 document.getElementById('sidebar').innerHTML =
- "<ul><li><a href='index.html' data-i18n='nav_overview'>Overview</a></li>"
+ "<ul><li><a href='index.html'>Overview</a></li>"
- + "<li><a href='ports.html' data-i18n='nav_port_config'>Port Configuration</a></li>"
+ + "<li><a href='ports.html'>Port Configuration</a></li>"
- + "<li><a href='stat.html' data-i18n='nav_port_stat'>Port Statistics</a></li>"
+ + "<li><a href='stat.html'>Port Statistics</a></li>"
- + "<li><a href='vlan.html' >VLAN</a></li>"
+ + "<li><a href='vlan.html'>VLAN</a></li>"
- + "<li><a href='l2.html' data-i18n='nav_l2'>L2 Configuration</a></li>"
+ + "<li><a href='l2.html'>L2 Configuration</a></li>"
- + "<li><a href='stp.html'>Spanning Tree</a></li>"
+ + "<li><a href='mirror.html'>Mirroring</a></li>"
- + "<li><a href='mirror.html' data-i18n='nav_mirror'>Mirroring</a></li>"
+ + "<li><a href='lag.html'>Link Aggregation</a></li>"
- + "<li><a href='lag.html' data-i18n='nav_lag'>Link Aggregation</a></li>"
+ + "<li><a href='eee.html'>EEE</a></li>"
- + "<li><a href='eee.html' data-i18n='nav_eee'>EEE</a></li>"
+ + "<li><a href='bandwidth.html'>Bandwidth Limits</a></li>"
- + "<li><a href='bandwidth.html' data-i18n='nav_bandwidth'>Bandwidth Limits</a></li>"
+ + "<li><a href='system.html'>System Settings</a></li>"
- + "<li><a href='system.html' data-i18n='nav_system'>System Settings</a></li>"
+ + "<li><a href='update.html'>Firmware Update</a></li></ul>";
 + "<li><a href='update.html' data-i18n='nav_fw_update'>Firmware Update</a></li></ul>";
 document.addEventListener('DOMContentLoaded', function() {
  var links = document.querySelectorAll('#sidebar a[data-i18n]');
  links.forEach(function(el) {
    var key = el.getAttribute('data-i18n');
    if (key) el.textContent = t(key);
  });
 });
@@ -1,20 +1,19 @@
 <!DOCTYPE html>
 <html>
  <script src="/main.js"></script>
  <script src="/i18n.js"></script>
  <link rel="stylesheet" href="style.css">
-  <title data-i18n="port_title">FreeSwitchOS Port Configuration</title>
+  <title>FreeSwitchOS Port Configuration</title>
  </head>
  <body>
    <nav id="sidebar"></nav>
    <div style="margin-left:16%;padding:1px 16px;height:1000px;">
    <div id="ports"></div>
-    <h1 data-i18n="port_heading">Port Configuration</h1>
+    <h1>Port Configuration</h1>
    <form id="vform" action="/vlan.html">
    <table id="speedtable">
-      <tr> <th data-i18n="port_col_port">Port</th> <th data-i18n="port_col_name">Name</th> <th data-i18n="port_col_speed">Current Link Speed</th><th data-i18n="port_col_devices">Connected devices</th><th data-i18n="port_col_set_speed">Set Speed</th><th data-i18n="port_col_disabled">Disabled</th><th data-i18n="port_col_apply">Apply</th></tr>
+      <tr> <th>Port</th> <th>Name</th> <th>Current Link Speed</th><th>Set Speed</th><th>Disabled</th><th>Apply</th></tr>
    </table>
-    <h2 style="margin-top:3em" data-i18n="port_mtu_heading">Configure Maximum Frame Size (MTU) forwarded at Port</h2>
+    <h2 style="margin-top:3em">Configure Maximum Frame Size (MTU) forwarded at Port</h2>
    <table id="mtutable" style="margin-top:1em">
    </table>
    <script src="/ports.js"></script>
@@ -3,30 +3,29 @@ var clicked = new Int8Array(10);
 function createPortTable() {
  var tbl = document.getElementById('speedtable');
   if (tbl.rows.length <= 2 && numPorts) {
-      const sSelect = '<select name="speed_sel" id="speed_sel">'
+     const sSelect = '<select name="speed_sel" id="speed_sel">'
-       + '<option value="auto">' + t('port_auto') + '</option>'
+      + '<option value="auto">Auto</option>'
-       + '<option value="2g5">' + t('port_2500m') + '</option>'
+      + '<option value="2g5">2500MBit/Full</option>'
-       + '<option value="1g">' + t('port_1000m') + '</option>'
+      + '<option value="1g">1000MBit/Full</option>'
-       + '<option value="100m full">' + t('port_100m_f') + '</option>'
+      + '<option value="100m full">100MBit/Full</option>'
-       + '<option value="100m half">' + t('port_100m_h') + '</option>'
+      + '<option value="100m half">100MBit/Half</option>'
-       + '<option value="10m full">' + t('port_10m_f') + '</option>'
+      + '<option value="10m full">10MBit/Full</option>'
-       + '<option value="10m half">' + t('port_10m_h') + '</option>'
+      + '<option value="10m half">10MBit/Half</option>'
-       + '</select>';
+      + '</select>';
      const dSwitch = '<input type="checkbox" id="disable_port" onchange="portOnOff();">'
     for (let i = 1; i <= numPorts; i++) {
      if (pIsSFP[i-1])
        continue;
      console.log("Table row: " + i + "pState: " + pState[i-2]);
      const tr = tbl.insertRow();
-      let td = tr.insertCell(); td.appendChild(document.createTextNode(t('common_port') + i));
+      let td = tr.insertCell(); td.appendChild(document.createTextNode(`Port ${i}`));
      let portName = portNames[physToLogPort[i-1]] || '';
      td = tr.insertCell(); td.appendChild(document.createTextNode(portName));
-      td = tr.insertCell(); td.innerHTML = linkText(pState[i] + 1);
+      td = tr.insertCell(); td.innerHTML = linkS[pState[i] + 1];
      tr.insertCell(); // filled by devRender()
      td = tr.insertCell(); td.innerHTML = sSelect.replaceAll("speed_sel", "speed_sel_" + i);
      td = tr.insertCell(); td.innerHTML = dSwitch.replaceAll("disable_port", "disable_port_" + i)
 						  .replace("portOnOff()", "portOnOff(" + i + ")");
-      var button = '<button type="button" style="margin: 0 0 0 24px" onclick="applySpeed(' + i + ');">' + t('port_apply') + '</button>';
+      var button = '<button type="button" style="margin: 0 0 0 24px" onclick="applySpeed(' + i + ');">Apply</button>';
      td = tr.insertCell();
      td.innerHTML = button;
    }
@@ -56,7 +55,7 @@ function createPortTable() {
      tr = tbl.insertRow();
      for (let i = 1; i <= numPorts; i++) {
        let td = tr.insertCell();
-        td.innerHTML = '<button type="button" style="margin: 0 0 0 24px" onclick="applyMTU(' + i + ');">' + t('port_apply') + '</button>';
+        td.innerHTML = '<button type="button" style="margin: 0 0 0 24px" onclick="applyMTU(' + i + ');">Apply</button>';
      }
  }
 }
@@ -69,7 +68,7 @@ function updatePortTable() {
  for (let i = 1; i <= numPorts ; i++) {
    if (pIsSFP[i-1])
      continue;
-    tbl.rows[i].cells[2].innerHTML = linkText(pState[i-1]+1);
+    tbl.rows[i].cells[2].innerHTML = `${linkS[pState[i-1]+1]}`;
    if (!clicked[i] && pState[i - 1] < 0) {
      document.getElementById('speed_sel_' + i).disabled = true;
      document.getElementById('disable_port_' + i).checked = true;
@@ -118,46 +117,6 @@ async function applyMTU(port) {
  }
 }
 function devRender(entries) {
  var tbl = document.getElementById('speedtable');
  if (tbl.rows.length <= 2 || !numPorts)
    return;
  var perPort = {};
  for (var i = 0; i < entries.length; i++) {
    var e = entries[i];
    if (e.port == 'CPU')
      continue;
    if (!perPort[e.port])
      perPort[e.port] = [];
    if (perPort[e.port].indexOf(e.mac) < 0)
      perPort[e.port].push(e.mac);
  }
  for (let i = 1; i <= numPorts; i++) {
    if (pIsSFP[i-1])
      continue;
    var cell = tbl.rows[i].cells[3];
    var macs = perPort[i] || [];
    if (macs.length == 1) {
      cell.textContent = macs[0];
      cell.title = '';
    } else if (macs.length > 1) {
      cell.textContent = macs.length + ' ' + t('port_devices');
      cell.title = macs.join('\n');
    } else {
      cell.textContent = '';
      cell.title = '';
    }
  }
 }
 function devWalk() {
  walkL2(function(entries, ok) {
    if (ok)
      devRender(entries);
    setTimeout(devWalk, 15000);
  });
 }
 function getMTUs() {
  var xhttp = new XMLHttpRequest();
  xhttp.onreadystatechange = function() {
@@ -184,7 +143,6 @@ window.addEventListener("load", function() {
    createPortTable();
    updatePortTable();
    getMTUs()
    setTimeout(devWalk, 3000);
    const interval = setInterval(update, 2000);
    const updatePortTableInterval = setInterval(updatePortTable, 1000);
  });
@@ -1,9 +1,8 @@
 <!DOCTYPE html>
 <html>
  <script src="/main.js"></script>
  <script src="/i18n.js"></script>
  <link rel="stylesheet" href="style.css">
-  <title data-i18n="stat_title">FreeSwitchOS Port Statistics</title>
+  <title>FreeSwitchOS Port Statistics</title>
  <style>
    .popup {
      display: none;
@@ -32,14 +31,14 @@
    <div id="ports"></div>
    <div id="popup" class="popup">
        <div class="popup-content">
-            <h2 data-i18n="stat_detailed">Detailed Port Statistics</h2>
+            <h2>Detailed Port Statistics</h2>
            <div id="popup_text"></div>
-            <button id="closePopup" class="action" data-i18n="stat_close">Close</button>
+            <button id="closePopup" class="action">Close</button>
        </div>
    </div>
-    <h1 data-i18n="stat_heading">Port Statistics</h1>
+    <h1>Port Statistics</h1>
    <table id="statstable">
-      <tr> <th data-i18n="stat_col_port">Port</th> <th data-i18n="stat_col_name">Name</th> <th data-i18n="stat_col_link">link</th> <th data-i18n="stat_col_tx_good">TX Good</th> <th data-i18n="stat_col_tx_bad">TX Bad</th> <th data-i18n="stat_col_rx_good">RX Good</th> <th data-i18n="stat_col_rx_bad">RX Bad</th> <th data-i18n="stat_col_all"> All Counters </th></tr>
+      <tr> <th>Port</th> <th>Name</th> <th>link</th> <th>TX Good</th> <th>TX Bad</th> <th>RX Good</th> <th>RX Bad</th> <th> All Counters </th></tr>
      <script src="/stat.js"></script>
    </table>
    </div>
@@ -109,44 +109,44 @@ const mib_counters = [
 function getCounters(port) {
  var xhttp = new XMLHttpRequest();
  const popup = document.getElementById('popup');
-  xhttp.onreadystatechange = function () {
+  xhttp.onreadystatechange = function() {
    if (this.readyState == 4 && this.status == 200) {
      const s = JSON.parse(xhttp.responseText);
      console.log("Counters: ", JSON.stringify(s));
      const ptext = document.getElementById('popup_text');
-      var tableHtml = "<table style='width:100%'> <tr> <th>" + t('stat_counter') + "</th> <th>" + t('stat_value') + "</th> <th>" + t('stat_counter') + "</th> <th>" + t('stat_value') + "</th></tr> <tr>";
+      var t = "<table style='width:100%'> <tr> <th>Counter</th> <th>Value</th> <th>Counter</th> <th>Value</th></tr> <tr>";
      console.log("Counter 0: ", BigInt(s[0]).toString(), " length: ", s.length);
      var c = 0;
      for (i = 0; i < mib_counters.length; i += 4) {
-        console.log(i, " ", mib_counters[i], ": ", mib_counters[i + 1]);
+        console.log(i, " ", mib_counters[i], ": ", mib_counters[i+1]);
        if (mib_counters[i] == "" && mib_counters[i + 1] == 8) {
          console.log("c " + i + ": continue");
          continue;
        }
-        var count = BigInt(s[i / 4]);
+        var count = BigInt(s[i/4]);
-        if (mib_counters[i + 1] == 8) {
+        if (mib_counters[i+1] == 8) {
-          tableHtml += "<td>" + mib_counters[i] + "</td><td>" + count.toString() + "</td>";
+          t += "<td>" + mib_counters[i] + "</td><td>" + count.toString() + "</td>";
          c += 1;
-        } else if (mib_counters[i + 1] == 4) {
+        } else if (mib_counters[i+1] == 4) {
          if (mib_counters[i] != "") {
-            tableHtml += "<td>" + mib_counters[i] + "</td><td>" + (count >> 32n).toString() + "</td>";
+            t += "<td>" + mib_counters[i] + "</td><td>" + (count >> 32n).toString() + "</td>";
            c += 1;
          }
          if (c == 2) {
-            tableHtml += "</tr> <tr>";
+            t += "</tr> <tr>";
            c = 0;
          }
-          if (mib_counters[i + 2] != "") {
+          if (mib_counters[i+2] != "") {
-            tableHtml += "<td>" + mib_counters[i + 2] + "</td><td>" + (count & 4294967295n).toString() + "</td>";
+            t += "<td>" + mib_counters[i+2] + "</td><td>" + (count & 4294967295n).toString() + "</td>";
            c += 1;
          }
        }
        if (c == 2) {
-          tableHtml += "</tr> <tr>";
+          t += "</tr> <tr>";
          c = 0;
        }
      }
-      ptext.innerHTML = tableHtml + "</tr></table>";
+      ptext.innerHTML = t + "</tr></table>";
      popup.style.display = 'flex';
    }
  };
@@ -161,26 +161,26 @@ function fillStats() {
    return;
  if (tbl.rows.length > 1) {
    for (let i = 0; i < numPorts; i++) {
-      console.log("Table Update row: " + i + " state " + pState[i] + " is " + linkS[pState[i] + 1]);
+      console.log("Table Update row: " + i + " state " + pState[i] + " is " + linkS[pState[i] +1]);
-      tbl.rows[i + 1].cells[2].innerHTML = linkText(pState[i] + 1);
+      tbl.rows[i+1].cells[2].innerHTML = `${linkS[pState[i]+1]}`;
-      tbl.rows[i + 1].cells[3].innerHTML = `${txG[i]}` + t('common_pkts');
+      tbl.rows[i+1].cells[3].innerHTML = `${txG[i]} pkts`;
-      tbl.rows[i + 1].cells[4].innerHTML = `${txB[i]}` + t('common_pkts');
+      tbl.rows[i+1].cells[4].innerHTML = `${txB[i]} pkts`;
-      tbl.rows[i + 1].cells[5].innerHTML = `${rxG[i]}` + t('common_pkts');
+      tbl.rows[i+1].cells[5].innerHTML = `${rxG[i]} pkts`;
-      tbl.rows[i + 1].cells[6].innerHTML = `${rxB[i]}` + t('common_pkts');
+      tbl.rows[i+1].cells[6].innerHTML = `${rxB[i]} pkts`;
    }
  } else {
    for (let i = 0; i < numPorts; i++) {
      console.log("Table row: " + i);
      const tr = tbl.insertRow();
-      let td = tr.insertCell(); td.appendChild(document.createTextNode(t('common_port') + (i + 1)));
+      let td = tr.insertCell(); td.appendChild(document.createTextNode(`Port ${i+1}`));
      let portName = portNames[physToLogPort[i]] || '';
      td = tr.insertCell(); td.appendChild(document.createTextNode(portName));
-      td = tr.insertCell(); td.appendChild(document.createTextNode(linkText(pState[i] + 1)));
+      td = tr.insertCell(); td.appendChild(document.createTextNode(`${linkS[pState[i]+1]}`));
-      td = tr.insertCell(); td.appendChild(document.createTextNode(`${txG[i]}` + t('common_pkts')));
+      td = tr.insertCell(); td.appendChild(document.createTextNode(`${txG[i]} pkts`));
-      td = tr.insertCell(); td.appendChild(document.createTextNode(`${txB[i]}` + t('common_pkts')));
+      td = tr.insertCell();td.appendChild(document.createTextNode(`${txB[i]} pkts`));
-      td = tr.insertCell(); td.appendChild(document.createTextNode(`${rxG[i]}` + t('common_pkts')));
+      td = tr.insertCell();td.appendChild(document.createTextNode(`${rxG[i]} pkts`));
-      td = tr.insertCell(); td.appendChild(document.createTextNode(`${rxB[i]}` + t('common_pkts')));
+      td = tr.insertCell();td.appendChild(document.createTextNode(`${rxB[i]} pkts`));
-      var button = '<button type="button" style="margin: 0 0 0 24px" onclick="getCounters(' + (i + 1) + ');">' + t('stat_show') + '</button>';
+      var button = '<button type="button" style="margin: 0 0 0 24px" onclick="getCounters(' + i + ');">Show</button>';
      td = tr.insertCell(); td.innerHTML = button;
    }
  }
@@ -197,8 +197,8 @@ window.addEventListener('click', (event) => {
  }
 });
-window.addEventListener("load", function () {
+window.addEventListener("load", function() {
-  update(() => {
+  update( () => {
    update();
    fillStats();
    const stat = setInterval(fillStats, 1000);
@@ -1,47 +0,0 @@
 <!DOCTYPE html>
 <html>
  <script src="/main.js"></script>
  <script src="/i18n.js"></script>
  <link rel="stylesheet" href="style.css">
  <title>FreeSwitchOS Spanning Tree</title>
  </head>
  <body>
    <nav id="sidebar"></nav>
    <div style="margin-left:16%;padding:1px 16px;height:1000px;">
    <div id="ports"></div>
    <h1>Spanning Tree (RSTP)</h1>
    <h2>Mode: <select id="stpMode"><option value="off">Disabled</option><option value="on">Enabled</option></select>
      <input style="width:15%;margin-left: 3em;" class="action" id="stp_sub" onclick="stpSub();" type="button" value="Apply"></h2>
    <div id="stpStat" style="font-family:monospace;"></div>
    <h2>Bridge settings</h2>
    <table id="stpBridge">
      <tr>
        <th>Priority</th><th>Version</th><th>Hello [s]</th><th>Max age [s]</th><th>Fwd delay [s]</th><th>Tx hold</th>
      </tr>
      <tr>
        <td><select id="bPrio"></select></td>
        <td><select id="bVer"><option value="rstp">RSTP</option><option value="stp">STP compat</option></select></td>
        <td><input id="bHello" type="number" min="1" max="10" style="width:4em"></td>
        <td><input id="bMaxage" type="number" min="6" max="40" style="width:4em"></td>
        <td><input id="bFwd" type="number" min="4" max="30" style="width:4em"></td>
        <td><input id="bTxhold" type="number" min="1" max="10" style="width:4em"></td>
      </tr>
    </table>
    <p style="font-size:small">Changes apply immediately. Edge ports skip the listen period; guard/filter act on received BPDUs.</p>
    <h2>Port configuration</h2>
    <table id="stpPortsTbl">
      <tr>
        <th>Port</th><th>State</th><th>Path Cost<br><span style="font-weight:normal;font-size:small">(0 = Auto)</span></th><th>Priority</th><th>Edge Port</th><th>BPDU Filter</th><th>Guard</th><th>Point-to-Point</th>
      </tr>
    </table>
    <h2>Port status</h2>
    <table id="stpStatTbl">
      <tr>
        <th>Port</th><th>Port State</th><th>Role</th><th>Designated Bridge</th><th>Designated Port ID</th><th>Designated Cost</th><th>Oper. Edge</th><th>Oper. P2P</th>
      </tr>
    </table>
    <script src="/stp.js"></script>
    </div>
  </body>
  <script src="/navigation.js"></script>
 </html>
@@ -1,187 +0,0 @@
 const STP_STATES = ["Disabled", "Blocking", "Learning", "Forwarding"];
 const STP_ROLES  = ["-", "Root", "Designated", "Alternate"];
 const PF_ENABLED = 1, PF_ADMEDGE = 2, PF_AUTOEDGE = 4, PF_BPDUGUARD = 8,
      PF_ROOTGUARD = 16, PF_FILTER = 32, PF_OPEREDGE = 64, PF_TRIPPED = 128;
 var stpDirty = false;
 var stpRows = 0;        // ports table built?
 async function stpCmd(cmd) {
  stpDirty = true;
  try {
    await fetch('/cmd', { method: 'POST', body: cmd });
  } catch(err) {
    console.error(`Error: ${err}`);
  }
  stpDirty = false;
  fetchStp();
 }
 function sel(id, opts, onch) {
  const s = document.createElement("select");
  s.id = id;
  for (const [v, label] of opts) {
    const o = document.createElement("option");
    o.value = v; o.textContent = label;
    s.appendChild(o);
  }
  s.addEventListener("change", onch);
  return s;
 }
 function num(id, min, max, onch) {
  const n = document.createElement("input");
  n.type = "number"; n.id = id; n.min = min; n.max = max; n.style.width = "4em";
  n.addEventListener("change", onch);
  return n;
 }
 function buildPortsTable(ports) {
  const tbl = document.getElementById("stpPortsTbl");
  const stat = document.getElementById("stpStatTbl");
  for (const p of [...ports].sort((a, b) => a.p - b.p)) {
    const tr = tbl.insertRow();
    tr.insertCell().textContent = p.p;                     // Port
    tr.insertCell().appendChild(sel("en_" + p.p,
      [["on","Enable"],["off","Disable"]],
      e => stpCmd("stp port " + p.p + " " + e.target.value)));
    const pc = num("cost_" + p.p, 0, 200000000,
      e => stpCmd("stp port " + p.p + " cost " + e.target.value));
    pc.style.width = "7em";
    pc.title = "0 - 200000000 (0 = Auto)";
    tr.insertCell().appendChild(pc);
    const pr = sel("prio_" + p.p, [], 
      e => stpCmd("stp port " + p.p + " prio " + e.target.value));
    for (let v = 0; v <= 240; v += 16) {
      const o = document.createElement("option");
      o.value = v; o.textContent = v + (v === 128 ? " (default)" : "");
      pr.appendChild(o);
    }
    tr.insertCell().appendChild(pr);
    tr.insertCell().appendChild(sel("edge_" + p.p,
      [["auto","Auto"],["on","Enable"],["off","Disable"]],
      e => stpCmd("stp port " + p.p + " edge " + e.target.value)));
    tr.insertCell().appendChild(sel("filt_" + p.p,
      [["off","Disable"],["on","Enable"]],
      e => stpCmd("stp port " + p.p + " filter " + e.target.value)));
    tr.insertCell().appendChild(sel("guard_" + p.p,
      [["none","None"],["bpdu","BPDU"],["root","Root"]],
      e => stpCmd("stp port " + p.p + " guard " + e.target.value)));
    tr.insertCell().appendChild(sel("p2p_" + p.p,
      [["auto","Auto"],["on","Enable"],["off","Disable"]],
      e => stpCmd("stp port " + p.p + " p2p " + e.target.value)));
    const sr = stat.insertRow();
    sr.insertCell().textContent = p.p;
    for (const id of ["st","role","db","dp","dc","oe","op"])
      sr.insertCell().id = id + "_" + p.p;
  }
  stpRows = ports.length;
 }
 function bridgeSelf(s) {
  return fmtBridgeId((s.prio * 4096).toString(16).padStart(4, "0") + s.myMac);
 }
 function fmtBridgeId(h) {
  if (!h || h.length < 16) return "";
  const prio = parseInt(h.slice(0, 4), 16);
  const mac = h.slice(4).replace(/(..)(?=.)/g, "$1:");
  return prio + "-" + mac.toUpperCase();
 }
 function fetchStp() {
  var xhttp = new XMLHttpRequest();
  xhttp.onreadystatechange = function() {
    if (this.readyState == 4 && this.status == 200) {
      const s = JSON.parse(xhttp.responseText);
      if (!stpRows)
        buildPortsTable(s.ports);
      document.getElementById("stpStat").textContent = s.on
        ? (s.weRoot
            ? "This switch (" + bridgeSelf(s) + ") is the root bridge — topology changes: "
              + parseInt(s.tc, 16)
            : "This switch: " + bridgeSelf(s)
              + " — root bridge: " + fmtBridgeId(s.rootPrio + s.rootMac)
              + " via port " + s.rootPort + " — path cost: " + parseInt(s.cost, 16)
              + " — topology changes: " + parseInt(s.tc, 16))
        : "";
      for (const p of s.ports) {
        const trip = (p.f & PF_TRIPPED) ? " (guard!)" : "";
        document.getElementById("st_" + p.p).textContent =
          s.on ? STP_STATES[p.st] + trip : "-";
        document.getElementById("role_" + p.p).textContent =
          s.on ? STP_ROLES[p.role] : "-";
        document.getElementById("db_" + p.p).textContent = s.on ? fmtBridgeId(p.db) : "-";
        document.getElementById("dp_" + p.p).textContent =
          s.on ? (parseInt(p.dp.slice(0, 2), 16) + "-" + parseInt(p.dp.slice(2), 16)) : "-";
        document.getElementById("dc_" + p.p).textContent = s.on ? parseInt(p.dc, 16) : "-";
        document.getElementById("oe_" + p.p).textContent =
          s.on ? ((p.f & PF_OPEREDGE) ? "True" : "False") : "-";
        document.getElementById("op_" + p.p).textContent = s.on ? (p.p2 == 2 ? "False" : "True") : "-";
      }
      if (stpDirty)          // an edit is in flight - do not revert controls
        return;
      document.getElementById("stpMode").value = s.on ? "on" : "off";
      document.getElementById("bPrio").value = s.prio;
      document.getElementById("bVer").value = s.rstp ? "rstp" : "stp";
      document.getElementById("bHello").value = s.hello;
      document.getElementById("bMaxage").value = s.maxage;
      document.getElementById("bFwd").value = s.fwd;
      document.getElementById("bTxhold").value = s.txhold;
      for (const p of s.ports) {
        document.getElementById("en_" + p.p).value = (p.f & PF_ENABLED) ? "on" : "off";
        document.getElementById("edge_" + p.p).value =
          (p.f & PF_ADMEDGE) ? "on" : ((p.f & PF_AUTOEDGE) ? "auto" : "off");
        document.getElementById("cost_" + p.p).value = parseInt(p.pc, 16);
        document.getElementById("prio_" + p.p).value = p.prio;
        document.getElementById("p2p_" + p.p).value = ["auto","on","off"][p.p2];
        document.getElementById("guard_" + p.p).value =
          (p.f & PF_BPDUGUARD) ? "bpdu" : ((p.f & PF_ROOTGUARD) ? "root" : "none");
        document.getElementById("filt_" + p.p).value = (p.f & PF_FILTER) ? "on" : "off";
      }
    }
  };
  xhttp.open("GET", `/stp.json`, true);
  sendXHTTP(xhttp);
 }
 async function stpSub() {
  const on = document.getElementById("stpMode").value === "on";
  document.getElementById("stpStat").textContent = on
    ? "Enabling STP. The ports start blocked and take up to "
      + (2 * document.getElementById("bFwd").value)
      + " s to reach forwarding, and this page can stay silent until they do."
    : "Disabling STP.";
  await stpCmd(on ? "stp on" : "stp off");
 }
 window.addEventListener("load", function() {
  const bp = document.getElementById("bPrio");
  for (let i = 0; i < 16; i++) {
    const o = document.createElement("option");
    o.value = i; o.textContent = (i * 4096) + (i === 8 ? " (default)" : "");
    bp.appendChild(o);
  }
  bp.addEventListener("change", e => stpCmd("stp prio " + e.target.value));
  document.getElementById("bVer")
    .addEventListener("change", e => stpCmd("stp version " + e.target.value));
  document.getElementById("bHello")
    .addEventListener("change", e => stpCmd("stp hello " + e.target.value));
  document.getElementById("bMaxage")
    .addEventListener("change", e => stpCmd("stp maxage " + e.target.value));
  document.getElementById("bFwd")
    .addEventListener("change", e => stpCmd("stp fwd " + e.target.value));
  document.getElementById("bTxhold")
    .addEventListener("change", e => stpCmd("stp txhold " + e.target.value));
  document.getElementById("stpMode")
    .addEventListener("change", () => { stpDirty = true; });
  update( () => {
    fetchStp();
    const interval = setInterval(update, 2000);
    const stpInt = setInterval(fetchStp, 2000);
  });
 });
@@ -82,7 +82,6 @@ object, img {
 .isNOK{ color: #900;}
 .isOK{ color: #090;}
 .ip{padding:8px 16px;margin-bottom: 1em;margin-left: 1em}
 .rotext{display:inline-block;padding:8px 16px;margin-bottom: 1em;margin-left: 1em}
 .row {display: flex;}
 .rcol {flex: 90%;}
 .lcol {flex: 10%;}
@@ -164,9 +163,3 @@ margin: 30px 0;
 }
 select { text-align-last: right; font-family: monospace}
 option { direction: rtl; font-family: sans-serif}
 #vlanTable td { text-align: left; }
 .l2sort{cursor:pointer;user-select:none}
 .l2sort:hover{text-decoration:underline}
 .l2arrow{opacity:0.55;font-size:0.85em}
 .l2filter{width:100%;box-sizing:border-box;font-weight:normal;font-size:0.9em}
@@ -1,9 +1,8 @@
 <!DOCTYPE html>
 <html>
  <head>
    <script src="/i18n.js"></script>
    <link rel="stylesheet" href="style.css">
-    <title data-i18n="sys_title">System Settings</title>
+    <title>System Settings</title>
    <style>
      .tab-bar { display: flex; border-bottom: 2px solid #226; margin-bottom: 0; margin-left: 16%; padding: 1px 16px; padding-bottom: 0; }
      .tab-btn { padding: 10px 20px; background-color: #ddf; border: none; cursor: pointer; font-size: 1em; border-radius: 8px 8px 0 0; margin-right: 4px; }
@@ -15,80 +14,46 @@
  </head>
  <body>
    <div class="tab-bar">
-      <button class="tab-btn active" onclick="openTab(event, 'system-tab')" data-i18n="sys_tab_system">System</button>
+      <button class="tab-btn active" onclick="openTab(event, 'system-tab')">System</button>
-      <button class="tab-btn" onclick="openTab(event, 'advanced-tab')" data-i18n="sys_tab_advanced">Advanced</button>
+      <button class="tab-btn" onclick="openTab(event, 'advanced-tab')">Advanced</button>
      <button class="tab-btn" onclick="openTab(event, 'console-tab')" data-i18n="sys_tab_console">Console</button>
    </div>
    <nav id="sidebar"></nav>
    <div style="margin-left:16%;padding:1px 16px;height:1000px;">
    <div id="ports"></div>
    <div id="system-tab" class="tab-content active">
-      <h1 data-i18n="sys_heading">System Settings</h1>
+      <h1>System Settings</h1>
      <div class="row">
-        <div class="lcol"> <label for="hostname" data-i18n="sys_hostname">Hostname:</label></div>
+        <div class="lcol"> <label for="ip">IP address:</label></div>
        <div class="rcol"> <input id="hostname" type="text" maxlength="23" size="20"/>
          <button onclick="hostSub()" data-i18n="sys_apply">Apply</button></div>
      </div>
      <div class="row">
        <div class="lcol"> <label data-i18n="sys_model">Model:</label></div>
        <div class="rcol"><span id="model" class="rotext"></span></div>
      </div>
      <div class="row">
        <div class="lcol"> <label for="ip" data-i18n="sys_ip">IP address:</label></div>
        <div class="rcol"> <input id="ip" class="ip" type="text" minlength="7" maxlength="15" size="15"/></div>
      </div>
      <div class="row">
-        <div class="lcol"> <label for="netmask" data-i18n="sys_netmask">Netmask:</label></div>
+        <div class="lcol"> <label for="netmask">Netmask:</label></div>
        <div class="rcol"><input id="netmask" class="ip" type="text" minlength="7" maxlength="15" size="15"/></div>
      </div>
      <div class="row">
-        <div class="lcol"> <label for="gw" data-i18n="sys_gateway">Gateway:</label></div>
+        <div class="lcol"> <label for="gw">Gateway:</label></div>
        <div class="rcol"><input id="gw" class="ip" type="text" minlength="7" maxlength="15" size="15"/></div>
      </div>
      <div class="row">
        <div class="lcol"> <label for="mgmtvlan" data-i18n="sys_mgmt_vlan">Management VLAN:</label></div>
        <div class="rcol"><select id="mgmtvlan" class="ip" onchange="mgmtVlanChanged()"></select></div>
      </div>
      <div class="row">
        <div class="lcol"> <label data-i18n="sys_language">Language:</label></div>
        <div class="rcol">
          <select id="lang-select" onchange="changeLang()">
            <option value="en">English</option>
            <option value="ja">日本語</option>
            <option value="zh">中文</option>
          </select>
        </div>
      </div>
      <br/>
-      <span data-i18n="sys_ip_note">When updating the above settings, remember to point your browser to the new IP afterwards:</span><br/>
+      When updating the above settings, remember to point your browser to the new IP afterwards:<br/>
-      <input style="width:40%;" class="action" id="ip_sub" onclick="ipSub();" type="button" data-i18n="sys_update" value="Update Settings"><br/>
+      <input style="width:40%;" class="action" id="ip_sub" onclick="ipSub();" type="button" value="Update Settings"><br/>
      <br/>
-      <span data-i18n="sys_save_label">Save all current settings to Flash:</span><br/>
+      Save all current settings to Flash:<br/>
-      <input style="width:40%;" class="action" id="flash_sub" onclick="flashSave();" type="button" data-i18n="sys_save" value="Save Settings to Flash">
+      <input style="width:40%;" class="action" id="flash_sub" onclick="flashSave();" type="button" value="Save Settings to Flash">
    </div>
    <div id="advanced-tab" class="tab-content">
-      <h1 data-i18n="sys_advanced">Advanced Settings</h1>
+      <h1>Advanced Settings</h1>
-      <div class="lcol"> <label for="config_display" data-i18n="sys_startup_config">Startup configuration:</label></div>
+      <div class="lcol"> <label for="config_display">Startup configuration:</label></div>
      <textarea id="config_display" rows="8" cols="60"></textarea>
      <br/><br/>
-      <span data-i18n="sys_startup_warn">Be careful when saving the directly edited startup configuration, you can lock yourself out:</span><br/>
+       Be careful when saving the directly edited startup configuration, you can lock yourself out:<br/>
-      <input style="width:40%;" class="action" id="clear_config" onclick="clearConfig();" type="button" data-i18n="sys_clear_config" value="Clear Startup Config">
+      <input style="width:40%;" class="action" id="clear_config" onclick="clearConfig();" type="button" value="Clear Startup Config">
      <br/>
-      <input style="width:40%;" class="action" id="flash_startup_sub" onclick="flashStartupSave();" type="button" data-i18n="sys_save_startup" value="Save Startup Settings to Flash">
+      <input style="width:40%;" class="action" id="flash_startup_sub" onclick="flashStartupSave();" type="button" value="Save Startup Settings to Flash">
      <br/>
-      <input style="width:40%;" class="action" id="switch_reset" onclick="resetSwitch();" type="button" data-i18n="sys_reset" value="Reset Switch">
+      <input style="width:40%;" class="action" id="switch_reset" onclick="resetSwitch();" type="button" value="Reset Switch">
    </div>
    <div id="console-tab" class="tab-content">
      <h1 data-i18n="sys_console">Console Command</h1>
      <label for="console_command" data-i18n="sys_enter_cmd">Enter command:</label>
      <input type="text" id="console_cmd" name="console_cmd" style="width:40%;">
      <input style="width:20%;" class="action" id="cmd_sub" onclick="cmdSub();" type="button" data-i18n="sys_send_cmd" value="Send Command"><br/>
      <br/><br/> 
      <span data-i18n="sys_console_warn">Be careful when entering console commands, you can lock yourself out!</span><br/>
    </div>
    </div>
@@ -1,15 +1,9 @@
 var systemInterval = Number();
 var isSaving = false;
 const ips = ["ip", "netmask", "gw"];
 function changeLang() {
  var lang = document.getElementById('lang-select').value;
  setLang(lang);
 }
 function checkIp(ip) {
  const ipv4 = /^(\d{1,3}\.){3}\d{1,3}$/;
-  if (!ipv4.test(ip)) {alert(t('sys_invalid_ip') + ip); return false };
+  if (!ipv4.test(ip)) {alert(`Invalid ip:${ip}`); return false };
  return true;
 }
@@ -18,78 +12,51 @@ async function ipSub() {
    if (!checkIp(document.getElementById(ips[i]).value))
      return;
  }
  var cmd = '';
  for (let i=0; i<3;i++){
-    cmd += ips[i]+' '+document.getElementById(ips[i]).value+'\n';
+    var cmd = ips[i]+' '+document.getElementById(ips[i]).value;
-  }
+    try {
-  try {
+      const response = await fetch('/cmd', {
-    const response = await fetch('/cmd', {
+        method: 'POST',
-      method: 'POST',
+        body: cmd
-      body: cmd
+      });
-    });
+      console.log('Completed!', response);
-    console.log('Completed!', response);
+      fetchIP();
-    fetchIP();
+    } catch(err) {
  } catch(err) {
    console.error(`Error: ${err}`);
  }
 }
 async function cmdSub() {
  var cmd = document.getElementById('console_cmd').value;
  try {
    const response = await fetch('/cmd', {
      method: 'POST',
      body: cmd
    });
    console.log('Completed!', response);
  } catch(err) {
      console.error(`Error: ${err}`);
    }
  }
 }
 async function hostSub() {
  const h = document.getElementById("hostname").value;
  try { await fetch('/cmd', { method: 'POST', body: "hostname " + h }); }
  catch(err) { console.error(`Error: ${err}`); }
  fetchIP();
 }
 async function sendConfig(c) {
-  if (isSaving) return;
+    const form = new FormData();
  isSaving = true;
  clearInterval(systemInterval);
  const form = new FormData();
  form.append("MAX_FILE_SIZE", "4096");
-  form.append("configuration", new Blob([c], {type: "application/octet-stream"}), "config.txt");
+  form.append("configuration", new Blob([c], {type: "application/octet-stream"}));
  try {
    const response = await fetch('/config', {
      method: 'POST',
      body: form
    });
    console.log('Completed!', response);
    try {
      await fetch('/cmd_log_clear', { method: 'GET' });
    } catch(e) {}
  } catch(err) {
    console.error(`Error: ${err}`);
  } finally {
    isSaving = false;
    systemInterval = setInterval(fetchIP, 1000);
  }
 }
 async function flashSave() {
-  configuration = [];
+  fetchConfig().then((s) => {
-  const savedConfig = await fetchConfig();
+    parseConf(s);
-  const cmdLog = await fetchCmdLog();
+    fetchCmdLog().then((s) => {
-  if (savedConfig) parseConf(savedConfig);
+      parseConf(s);
-  if (cmdLog) parseConf(cmdLog);
+      var body = "";
-  const body = configuration.join('\n') + '\n';
+      for (const x of configuration) { body = body + x + "\n"; }
-  console.log("CONFIGURATION to save: ", body);
+      console.log("CONFIGURATION to save: ", body);
-  await sendConfig(body);
+      sendConfig(body);
    });
  });
  setTimeout(() => {
      fetchIP();
  }, 500);
 }
 async function flashStartupSave() {
@@ -131,9 +98,6 @@ function fetchIP() {
      document.getElementById("ip").value=s.ip_address;
      document.getElementById("netmask").value=s.ip_netmask;
      document.getElementById("gw").value=s.ip_gateway;
      document.getElementById("hostname").value=s.hostname;
      document.getElementById("model").textContent=s.hw_ver;
      loadMgmtVlan();
      clearInterval(systemInterval);
      // Fetch and populate the config textbox
      fetchConfig().then((configText) => {
@@ -152,57 +116,15 @@ function fetchIP() {
 }
 function resetSwitch() {
-  if (!confirm(t('sys_reset_confirm'))) {
+  if (!confirm('Are you sure you want to reset the switch?')) {
    return;
  }
  fetch('/reset', { method: 'GET' }).catch(() => {});
  setTimeout(() => {
-    alert(t('sys_resetting'));
+    alert('Switch is resetting. Please wait and refresh the page.');
  }, 3000);
 }
 window.addEventListener("load", function() {
  var langSel = document.getElementById('lang-select');
  if (langSel) langSel.value = rtlLang;
  systemInterval = setInterval(fetchIP, 1000);
 });
 var mgmtVlanCurrent = 0;
 function loadMgmtVlan() {
  var sel = document.getElementById('mgmtvlan');
  if (!sel) return;
  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');
      none.value = 0; none.disabled = true;
      none.textContent = t('sys_mgmt_untagged');
      sel.appendChild(none);
    }
    for (var i = 0; i < list.length; i++) {
      var o = document.createElement('option');
      o.value = list[i].id;
      o.textContent = list[i].name ? (list[i].id + ' (' + list[i].name + ')') : list[i].id;
      sel.appendChild(o);
    }
    sel.value = cur;
  }).catch(function(err) { console.error('VLAN list failed:', err); });
 }
 function mgmtVlanChanged() {
  var sel = document.getElementById('mgmtvlan');
  var id = parseInt(sel.value, 10);
  if (!id || id === mgmtVlanCurrent) return;
  if (!confirm(t('sys_mgmt_confirm') + id + '.\n\n' + t('sys_mgmt_warn'))) {
    sel.value = mgmtVlanCurrent;
    return;
  }
  fetch('/cmd', { method: 'POST', body: 'vlan ' + id + ' mgmt' })
    .then(function() { mgmtVlanCurrent = id; })
    .catch(function(err) { console.error('Set management VLAN failed:', err); sel.value = mgmtVlanCurrent; });
 }
@@ -1,19 +1,18 @@
 <!DOCTYPE html>
 <html>
  <head>
    <script src="/i18n.js"></script>
    <link rel="stylesheet" href="style.css">
-    <title data-i18n="update_title">Firmware update</title>
+    <title>Firmware update</title>
  </head>
  <body>
    <nav id="sidebar"></nav>
    <div style="margin-left:16%;padding:1px 16px;height:1000px;width:40%;">
-    <h1 data-i18n="update_heading">Firmware Update</h1>
+    <h1>Firmware Update</h1>
    <form enctype="multipart/form-data" action="/upload" method="POST">
    <input type="hidden" name="MAX_FILE_SIZE" value="1000000" />
-      <span data-i18n="update_instruction">Choose a firmware update file to upload:</span> <br/> <br/>
+      Choose a firmware update file to upload: <br/> <br/>
      <input name="uploadedfile" type="file" accept=".bin" /><br />
-    <input style="margin-top:3em" type="submit" data-i18n="update_upload" value="Upload File" />
+    <input style="margin-top:3em" type="submit" value="Upload File" />
    </form>
    <script src="/navigation.js"></script>
  </body>
--- a/Show More
+++ b/Show More