Merge pull request #355 from bloqaudio/fix/l2-static-display

httpd: read the static flag of an L2 entry from the byte that holds it
Merge pull request #357 from bloqaudio/fix/ingress-port-bound
2026-08-30 14:52:51 +08:00 · 2026-08-18 19:44:05 +02:00 · 2026-08-18 09:05:06 +02:00 · 2026-08-17 17:19:46 -05:00 · 2026-08-17 12:17:42 -05:00
2 changed files with 2 additions and 2 deletions
@@ -529,7 +529,7 @@ void parse_ingress(void)
 			if (!isnumber(p)) {
 				continue;
 			}
-			if (p - '1' > 9) {
+			if (p < '1') {
 				print_string("Invalid physical port number: "); write_char(p); write_char('\n');
 				continue;
 			}
@@ -397,7 +397,7 @@ void send_l2(uint16_t idx)

 			// type
 			reg_read_m(RTL837x_L2_DATA_OUT_C);
-			if (sfr_data[2] & 0x1)
+			if (sfr_data[1] & 0x1)
 				slen += strtox(outbuf + slen, "\",\"type\":\"s\",\"port\":");
 			else
 				slen += strtox(outbuf + slen, "\",\"type\":\"l\",\"port\":");
Author	SHA1	Message	Date
logicog	52cf759bec	Merge pull request #355 from bloqaudio/fix/l2-static-display httpd: read the static flag of an L2 entry from the byte that holds it	2026-08-18 19:44:05 +02:00
René van Dorst	cbbc6160f4	Merge pull request #357 from bloqaudio/fix/ingress-port-bound cmd_parser: reject port 0 in the ingress command	2026-08-18 09:05:06 +02:00
bloqaudio	a8d3b7d39a	cmd_parser: reject port 0 in the ingress command The single-digit arm of the ingress parser guards with p - '1' > 9, which no digit can satisfy: the largest, '9', gives 8. The digit that needed rejecting is '0', which gives -1 and indexes one byte before phys_to_log_port, so "ingress 0 t" reads out of bounds and applies the ingress mode to whatever port number that byte happens to contain. Ports are 1-based, so reject anything below '1'; values above '9' are already excluded by the isnumber check before this.	2026-08-17 17:19:46 -05:00
bloqaudio	a3d1a35e2f	httpd: read the static flag of an L2 entry from the byte that holds it The MAC table listing tests bit 0 of byte 2 of the third table data word for the static flag, but the flag lives in bit 0 of byte 1: an entry written with byte 1 bit 0 set survives the aging engine indefinitely where an identical entry without it ages out, and reads back with exactly that bit set through both the address and the next-entry read methods. Byte 2 of that word reads zero for learned and static entries alike, so every entry has always been listed as learned and a static entry has never been visible as such in the table listing.	2026-08-17 12:17:42 -05:00