From: Adolf Belka <adolf.belka@ipfire.org>
Date: Thu, 5 Aug 2021 21:01:52 +0000 (+0200)
Subject: wlanap.cgi: Access db.txt in place of using regdbdump on regulatory.bin
X-Git-Tag: v2.27-core160~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15db822688a673d426fd76509aeb88895f3af88c;p=ipfire-2.x.git

wlanap.cgi: Access db.txt in place of using regdbdump on regulatory.bin

- 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>
Reviewed-by: Bernhard Bitsch <bbitsch@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index eba5fe774e..5eb34d651a 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){