scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-10-30 10:22:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

associate_ap: now uses Utils::mac_add when multiple stations requested but mac_pattern lacks tokens

Browse Source
This commit is contained in:
Jed Reynolds
2020-04-29 00:45:38 -07:00
parent da4d6cbe3a
commit d2891904ac
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lf_associate_ap.pl
View File

@@ -460,7 +460,7 @@ sub new_mac_from_pattern {
die ("::new_mac_pattern: blank pattern. Please debug.") if ($pattern eq ""); die ("::new_mac_pattern: blank pattern. Please debug.") if ($pattern eq "");
if (($pattern !~ /x+/i) && ($pattern !~ /[*]+/)) { if (($pattern !~ /x+/i) && ($pattern !~ /[*]+/)) {
return $pattern; return $pattern; # this lacks pattern tokens
} }
my @parent_hunks = split(":", $parent_mac); my @parent_hunks = split(":", $parent_mac);
@@ -737,9 +737,11 @@ sub new_wifi_station {
my $parent_mac = get_radio_bssid($::sta_wiphy); my $parent_mac = get_radio_bssid($::sta_wiphy);
die("new_wifi_station: unable to find bssid of parent radio") if ($parent_mac eq ""); die("new_wifi_station: unable to find bssid of parent radio") if ($parent_mac eq "");
$mac_addr = new_mac_from_pattern($parent_mac, $::mac_pattern); $mac_addr = new_mac_from_pattern($parent_mac, $::mac_pattern);
if (($mac_addr eq $parent_mac) && ($::num_stations > 1)) { #print "OLD MAC $::mac_pattern NEW MAC $mac_addr\n";
$mac_addr = $::utils->mac_add($parent_mac, $num_in_series); if (($mac_addr eq $::mac_pattern) && ($num_in_series > 0)) {
$mac_addr = $::utils->mac_add($::mac_pattern, $num_in_series);
} }
#print "OLD MAC $::mac_pattern NEWER MAC $mac_addr\n";
#print "new_wifi_station->new_mac_from_pattern: $mac_addr\n"; #print "new_wifi_station->new_mac_from_pattern: $mac_addr\n";
} }