Skip to content

Commit

Permalink
hostapd: remove default r1_key_holder generation
Browse files Browse the repository at this point in the history 
By default, hostapd assumes r1_key_holder equal to bssid. If LEDE
configures the same static r1 key holder ID on two different APs (BSSes) the
RRB exchanges fails behind them.

Signed-off-by: Yury Shvedov <yshvedov@wimarksystems.com>
  • Loading branch information
@blogic
Yury Shvedov authored and blogic committed Nov 6, 2017
1 parent ee791fa commit 09f90b7
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions package/network/services/hostapd/files/hostapd.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -397,15 +397,14 @@ hostapd_set_bss_options() {

set_default mobility_domain "4f57"
set_default r0_key_lifetime 10000
set_default r1_key_holder "00004f577274"
set_default reassociation_deadline 1000
set_default pmk_r1_push 0
set_default ft_psk_generate_local 0
set_default ft_over_ds 1

append bss_conf "mobility_domain=$mobility_domain" "$N"
append bss_conf "r0_key_lifetime=$r0_key_lifetime" "$N"
append bss_conf "r1_key_holder=$r1_key_holder" "$N"
[ -n "$r1_key_holder" ] && append bss_conf "r1_key_holder=$r1_key_holder" "$N"
append bss_conf "reassociation_deadline=$reassociation_deadline" "$N"
append bss_conf "pmk_r1_push=$pmk_r1_push" "$N"
append bss_conf "ft_psk_generate_local=$ft_psk_generate_local" "$N"
Expand Down

4 comments on commit 09f90b7

@devianceluka
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why dont you accept my PR thats 100,000 times better?

@blogic
Copy link
Contributor

@blogic blogic commented on 09f90b7 Nov 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@devianceluka link ?

@devianceluka
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1382

@devianceluka
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@blogic will you accept it or not? I have to fix it to be compatible because of your one line or you revert your commit and its done.

My PR simplyfies and corrects everything so everything one should do is do "option ieee80211r 1" and everything is done automatically.

Please sign in to comment.