Skip to content

W
White Rabbit Switch - Software
Commit ac632613 authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

rvlan: actually force auth_vlan at startup 

Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent f5504746
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 5 deletions
userspace/tools/radiusvlan.c
View file @ ac632613
......@@ -434,9 +434,6 @@ static int rvlan_enumerate_devices(char *prefix)
continue;
}
dev->chosen_vlan = rvlan_auth_vlan;
rvlan_change_pending++;
dev->next = devs;
devs = dev;
}
......@@ -473,7 +470,7 @@ int rvlan_prepare_poll(void)
int rvlan_initial_check(void)
{
struct rvlan_dev *dev;
char path[64], upbuf[16];
char path[64], upbuf[16], cmdstr[128];
FILE *f;
int ret, up = 1;
......@@ -495,8 +492,19 @@ int rvlan_initial_check(void)
up = 0;
}
dev->up_now = up;
if (up)
if (up) {
dev->fsm_state = RVLAN_JUSTUP;
dev->chosen_vlan = rvlan_auth_vlan;
rvlan_change_pending++;
sprintf(cmdstr, "wrs_vlans --port %i --pvid %i "
"> /dev/null 2> /dev/null",
dev->portnr, dev->chosen_vlan);
if (system(cmdstr)) {
fprintf(stderr, "%s: %s: can't set vlan %i\n",
prgname, dev->name, dev->chosen_vlan);
continue;
}
}
if (verbose)
printf("%s\n", up ? "up" : "down");
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment