From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH v4 8/8] wlanap.cgi: Access db.txt in place of using regdbdump on regulatory.bin Date: Thu, 05 Aug 2021 23:01:52 +0200 Message-ID: <20210805210152.3467498-8-adolf.belka@ipfire.org> In-Reply-To: <20210805210152.3467498-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7265284378768080503==" List-Id: --===============7265284378768080503== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable - 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 coul= d not be used. - wireless-regdb also has a text based database list in the source tarball an= d 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 regula= torydb.txt - The command to read the data from regulatorydb.txt into @countrylist_cmd ha= s been corrected Signed-off-by: Adolf Belka --- 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 =3D~ /\d+/ ){push(@temp,$channel + 0);} push(@channellist, @temp); } =20 -my @countrylist_cmd =3D `regdbdump /usr/lib/crda/regulatory.bin 2>/dev/null`; # get available country codes +open(FILE, =E2=80=9C; +close(FILE); + =20 my @temp =3D "00"; foreach (@countrylist_cmd){ --=20 2.32.0 --===============7265284378768080503==--