[v4,8/8] wlanap.cgi: Access db.txt in place of using regdbdump on regulatory.bin

Message ID 20210805210152.3467498-8-adolf.belka@ipfire.org
State New
Headers show
Series [v4,1/8] make.sh: Remove crda and remaining python2 modules | expand

Commit Message

Adolf Belka Aug. 5, 2021, 9:01 p.m. UTC
- wlanap.cgi was using regdbdump from crda to create a text based list of the
   wireless settings by country database.
- With the removal of crda as part of the removal of python2 this option could not be
   used.
- wireless-regdb also has a text based database list in the source tarball and this
   patch makes wlanap.cgi read this list into the @countrylist_cmd variable
- This needs to be tested by someone that has an IPFire system with wifi that can access
   and evaluate wlanap.cgi to confirm that this change functions as expected.
- This version changes the name of the stored text file from db.txt to regulatorydb.txt
- The command to read the data from regulatorydb.txt into @countrylist_cmd has been
   corrected

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 html/cgi-bin/wlanap.cgi | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Bernhard Bitsch Aug. 5, 2021, 9:18 p.m. UTC | #1
Reviewed-by: Bernhard Bitsch <bbitsch@ipfire.org>

Am 05.08.2021 um 23:01 schrieb Adolf Belka:
> - wlanap.cgi was using regdbdump from crda to create a text based list of the
>     wireless settings by country database.
> - With the removal of crda as part of the removal of python2 this option could not be
>     used.
> - wireless-regdb also has a text based database list in the source tarball and this
>     patch makes wlanap.cgi read this list into the @countrylist_cmd variable
> - This needs to be tested by someone that has an IPFire system with wifi that can access
>     and evaluate wlanap.cgi to confirm that this change functions as expected.
> - This version changes the name of the stored text file from db.txt to regulatorydb.txt
> - The command to read the data from regulatorydb.txt into @countrylist_cmd has been
>     corrected
> 
> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
> ---
>   html/cgi-bin/wlanap.cgi | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
> index eba5fe774..5eb34d651 100644
> --- a/html/cgi-bin/wlanap.cgi
> +++ b/html/cgi-bin/wlanap.cgi
> @@ -312,8 +312,11 @@ if ( $channel =~ /\d+/ ){push(@temp,$channel + 0);}
>   push(@channellist, @temp);
>   }
>   
> -my @countrylist_cmd = `regdbdump /usr/lib/crda/regulatory.bin 2>/dev/null`;
>   # get available country codes
> +open(FILE, “</lib/firmware/regulatorydb.txt”);
> +my @countrylist_cmd = <FILE>;
> +close(FILE);
> +
>   
>   my @temp = "00";
>   foreach (@countrylist_cmd){
>

Patch

diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index eba5fe774..5eb34d651 100644
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -312,8 +312,11 @@  if ( $channel =~ /\d+/ ){push(@temp,$channel + 0);}
 push(@channellist, @temp);
 }
 
-my @countrylist_cmd = `regdbdump /usr/lib/crda/regulatory.bin 2>/dev/null`;
 # get available country codes
+open(FILE, “</lib/firmware/regulatorydb.txt”);
+my @countrylist_cmd = <FILE>;
+close(FILE);
+
 
 my @temp = "00";
 foreach (@countrylist_cmd){