Skip to content

Stop beaconing if bcning null or absent #216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
emanuele-dedonatis wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Stop beaconing if bcning null or absent #216

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/s2e.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1098,8 +1098,13 @@ static int handle_router_config (s2ctx_t* s2ctx, ujdec_t* D) {
break;
}
case J_bcning: {
if( uj_null(D) )
if( uj_null(D) ) {
// Explicitly disable beaconing
rt_clrTimer(&s2ctx->bcntimer);
memset(&s2ctx->bcn, 0, sizeof(s2ctx->bcn));
LOG(MOD_S2E|INFO, "Beaconing disabled (bcning: null)");
break;
}
uj_enterObject(D);
while( (field = uj_nextField(D)) ) {
switch(field) {
Expand Down Expand Up @@ -1227,6 +1232,11 @@ static int handle_router_config (s2ctx_t* s2ctx, ujdec_t* D) {
bcn.layout[0], bcn.layout[1], bcn.layout[2]);
s2ctx->bcn = bcn;
s2e_bcntimeout(&s2ctx->bcntimer);
} else if( (s2ctx->bcn.ctrl&0xF0) != 0 ) {
// bcning field was absent or had no frequencies - stop any ongoing beaconing
rt_clrTimer(&s2ctx->bcntimer);
memset(&s2ctx->bcn, 0, sizeof(s2ctx->bcn));
LOG(MOD_S2E|INFO, "Beaconing disabled (bcning field absent or no frequencies)");
}
return 1;
}
Expand Down