gitproxy/RTLPlayground
1
0
Fork 0
mirror of https://github.com/logicog/RTLPlayground.git synced 2026-08-30 14:52:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

parse_ingress() make use of cmd_words_len, refactor small parts

Browse Source
This commit is contained in:
René van Dorst
2026-04-18 19:35:51 +02:00
parent 1fe236246a
commit f71e869b97
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd_parser.c
+10 -9
View File
@@ -476,7 +476,7 @@ bool vlan_ingress_mode_parse(char c, vlan_ingress_mode_t *mode)
void parse_ingress(void) void parse_ingress(void)
{ {
if (cmd_words_b[1] <= 0) { if (cmd_words_len < 2) {
goto err; goto err;
} }
__xdata uint8_t log_port = 0; __xdata uint8_t log_port = 0;
@@ -494,24 +494,25 @@ void parse_ingress(void)
} }
return; return;
} else { } else {
for(uint8_t w = 1; cmd_words_b[w] > 0; w++) { for(uint8_t w = 1; w < cmd_words_len; w++) {
if (!isnumber(cmd_buffer[cmd_words_b[w]])) { uint8_t p = cmd_buffer[cmd_words_b[w]];
if (!isnumber(p)) {
continue; continue;
} }
if (cmd_buffer[cmd_words_b[w]] - '1' > 9) { if (p - '1' > 9) {
print_string("Invalid physical port number: "); write_char(cmd_buffer[cmd_words_b[w]]); write_char('\n'); print_string("Invalid physical port number: "); write_char(p); write_char('\n');
continue; continue;
} }
log_port = machine.phys_to_log_port[cmd_buffer[cmd_words_b[w]] - '1']; log_port = machine.phys_to_log_port[p - '1'];
if (!vlan_ingress_mode_parse(cmd_buffer[cmd_words_b[w] + 1], &mode)) { if (!vlan_ingress_mode_parse(cmd_buffer[cmd_words_b[w] + 1], &mode)) {
print_string("Invalid ingress mode for port "); write_char(cmd_buffer[cmd_words_b[w]]); print_string(" in ingress command\n"); print_string("Invalid ingress mode for port "); write_char(p); print_string(" in ingress command\n");
goto err; goto err;
} }
if (!port_ingress_filter(log_port, mode)) { if (!port_ingress_filter(log_port, mode)) {
print_string("Error setting ingress filter for port "); write_char(cmd_buffer[cmd_words_b[w]]); write_char('\n'); print_string("Error setting ingress filter for port "); write_char(p); write_char('\n');
return; return;
} }
print_string("Port "); write_char(cmd_buffer[cmd_words_b[w]]); print_string("Port "); write_char(p);
print_string(" ingress filter set to: "); print_string(" ingress filter set to: ");
print_port_ingress_filter_mode(mode); write_char('\n'); print_port_ingress_filter_mode(mode); write_char('\n');
} }