matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bridge: rename and export print_portstate 

Rename print_portstate to print_stp_state in preparation for use by vlan
code as well (per-vlan state), and export it. To be in line with the new
naming rename also port_states to stp_states as they'll be used for
vlans, too.

Signed-off-by: Nikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: David Ahern <dsahern@kernel.org>
This commit is contained in:
Nikolay Aleksandrov 2021-04-18 15:01:32 +03:00 committed by David Ahern
parent ff619e4fd3
commit f07516c3b0
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bridge/br_common.h
View File

@ -10,6 +10,7 @@ void print_vlan_info(struct rtattr *tb, int ifindex);
int print_linkinfo(struct nlmsghdr *n, void *arg); int print_linkinfo(struct nlmsghdr *n, void *arg);
int print_mdb_mon(struct nlmsghdr *n, void *arg); int print_mdb_mon(struct nlmsghdr *n, void *arg);
int print_fdb(struct nlmsghdr *n, void *arg); int print_fdb(struct nlmsghdr *n, void *arg);
void print_stp_state(__u8 state);
int do_fdb(int argc, char **argv); int do_fdb(int argc, char **argv);
int do_mdb(int argc, char **argv); int do_mdb(int argc, char **argv);

14
bridge/link.c
View File

@ -19,7 +19,7 @@
static unsigned int filter_index; static unsigned int filter_index;
static const char *port_states[] = { static const char *stp_states[] = {
[BR_STATE_DISABLED] = "disabled", [BR_STATE_DISABLED] = "disabled",
[BR_STATE_LISTENING] = "listening", [BR_STATE_LISTENING] = "listening",
[BR_STATE_LEARNING] = "learning", [BR_STATE_LEARNING] = "learning",
@ -68,11 +68,11 @@ static void print_link_flags(FILE *fp, unsigned int flags, unsigned int mdown)
close_json_array(PRINT_ANY, "> "); close_json_array(PRINT_ANY, "> ");
} }
static void print_portstate(__u8 state) void print_stp_state(__u8 state)
{ {
if (state <= BR_STATE_BLOCKING) if (state <= BR_STATE_BLOCKING)
print_string(PRINT_ANY, "state", print_string(PRINT_ANY, "state",
"state %s ", port_states[state]); "state %s ", stp_states[state]);
else else
print_uint(PRINT_ANY, "state", print_uint(PRINT_ANY, "state",
"state (%d) ", state); "state (%d) ", state);
@ -96,7 +96,7 @@ static void print_protinfo(FILE *fp, struct rtattr *attr)
parse_rtattr_nested(prtb, IFLA_BRPORT_MAX, attr); parse_rtattr_nested(prtb, IFLA_BRPORT_MAX, attr);
if (prtb[IFLA_BRPORT_STATE]) if (prtb[IFLA_BRPORT_STATE])
print_portstate(rta_getattr_u8(prtb[IFLA_BRPORT_STATE])); print_stp_state(rta_getattr_u8(prtb[IFLA_BRPORT_STATE]));
if (prtb[IFLA_BRPORT_PRIORITY]) if (prtb[IFLA_BRPORT_PRIORITY])
print_uint(PRINT_ANY, "priority", print_uint(PRINT_ANY, "priority",
@ -161,7 +161,7 @@ static void print_protinfo(FILE *fp, struct rtattr *attr)
print_on_off(PRINT_ANY, "isolated", "isolated %s ", print_on_off(PRINT_ANY, "isolated", "isolated %s ",
rta_getattr_u8(prtb[IFLA_BRPORT_ISOLATED])); rta_getattr_u8(prtb[IFLA_BRPORT_ISOLATED]));
} else } else
print_portstate(rta_getattr_u8(attr)); print_stp_state(rta_getattr_u8(attr));
} }
@ -359,12 +359,12 @@ static int brlink_modify(int argc, char **argv)
} else if (strcmp(*argv, "state") == 0) { } else if (strcmp(*argv, "state") == 0) {
NEXT_ARG(); NEXT_ARG();
char *endptr; char *endptr;
size_t nstates = ARRAY_SIZE(port_states); size_t nstates = ARRAY_SIZE(stp_states);
state = strtol(*argv, &endptr, 10); state = strtol(*argv, &endptr, 10);
if (!(**argv != '\0' && *endptr == '\0')) { if (!(**argv != '\0' && *endptr == '\0')) {
for (state = 0; state < nstates; state++) for (state = 0; state < nstates; state++)
if (strcasecmp(port_states[state], *argv) == 0) if (strcasecmp(stp_states[state], *argv) == 0)
break; break;
if (state == nstates) { if (state == nstates) {
fprintf(stderr, fprintf(stderr,