scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-11-01 03:07:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

lf-associate: Properly ignore channel and nss if user does not input any values.

Browse Source 
Otherwise, radio values are un-expectedly set to the default values.
This commit is contained in:
Ben Greear
2020-03-31 14:36:03 -07:00
parent ce62e2ed00
commit 9e12eac1e6
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lf_associate_ap.pl
View File

@@ -94,8 +94,8 @@ my $log_cli = "unset"; # use ENV{'LOG_CLI'}
# and we're assuming the port is on the same resource (1). # and we're assuming the port is on the same resource (1).
our $upstream_port = "eth1"; # Step 1 upstream port our $upstream_port = "eth1"; # Step 1 upstream port
our $sta_wiphy = "wiphy0"; # physical parent (radio) of virtual stations our $sta_wiphy = "wiphy0"; # physical parent (radio) of virtual stations
our $phy_channel = -1; # channel number our $phy_channel = ""; # channel number
our $phy_antenna = 0; # number of antennas, all our $phy_antenna = ""; # number of antennas, 0 means all
our %wiphy_bssids = (); our %wiphy_bssids = ();
our $admin_down_on_add = 0; our $admin_down_on_add = 0;
our $ssid; our $ssid;
@@ -1521,8 +1521,10 @@ sub set_antenna {
die("Antenna mode [$ant] does not exist.") die("Antenna mode [$ant] does not exist.")
if (! exists $::antenna_table{$ant}); if (! exists $::antenna_table{$ant});
my $mode = 'NA'; my $mode = 'NA';
my $chan = ((defined $::phy_channel) && ($::phy_channel > 0)) my $chan = $::phy_channel;
? $::phy_channel : 'NA'; if ($chan eq "") {
$chan = "NA";
}
my $country = 'NA'; my $country = 'NA';
my $freq = 'NA'; #'0xFFFF' will override channel my $freq = 'NA'; #'0xFFFF' will override channel
my $frag = 'NA'; my $frag = 'NA';
@@ -1685,10 +1687,10 @@ if (!($action =~ /del/)) { # Below steps are unrelated to deleting objects
} }
if ($action =~ /step|add/) { if ($action =~ /step|add/) {
if (defined $::phy_channel && $::phy_channel > 0) { if ($::phy_channel ne "") {
set_channel($::resource, $::sta_wiphy, $::phy_channel); set_channel($::resource, $::sta_wiphy, $::phy_channel);
} }
if (defined $::phy_antenna) { if ($::phy_antenna ne "") {
set_antenna($::resource, $::sta_wiphy, $::phy_antenna); set_antenna($::resource, $::sta_wiphy, $::phy_antenna);
} }
} }