webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-18 15:02:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

dns.cgi: Move grab_address_from_file function to general-functions.pl

Browse Source 
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
This commit is contained in:
Stefan Schantl
2020-01-08 18:44:41 +01:00
parent 8f4bde6574
commit 9702252470
2 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
config/cfgroot/general-functions.pl
View File

@@ -1177,4 +1177,35 @@ sub number_cpu_cores() {
return $cores;
}
# Tiny function to grab a single IP-address from a given file.
sub grab_address_from_file($) {
my ($file) = @_;
my $address;
# Check if the given file exists.
if(-f $file) {
# Open the file for reading.
open(FILE, $file) or die "Could not read from $file. $!\n";
# Read the address from the file.
$address = <FILE>;
# Close filehandle.
close(FILE);
# Remove newlines.
chomp($address);
# Check if the obtained address is valid.
if (&validip($address)) {
# Return the address.
return $address;
}
}
# Return nothing.
return;
}
1;

33
html/cgi-bin/dns.cgi
View File

@@ -480,7 +480,7 @@ END
# Loop through the array which stores the files.
foreach my $file (@ISP_nameserver_files) {
# Grab the address of the nameserver.
my $address = &grab_address_from_file($file);
my $address = &General::grab_address_from_file($file);
# Check if we got an address.
if ($address) {
@@ -815,37 +815,6 @@ sub red_is_active () {
}
}
# Tiny function to grab an IP-address of a given file.
sub grab_address_from_file($) {
my ($file) = @_;
my $address;
# Check if the given file exists.
if(-f $file) {
# Open the file for reading.
open(FILE, $file) or die "Could not read from $file. $!\n";
# Read the address from the file.
$address = <FILE>;
# Close filehandle.
close(FILE);
# Remove newlines.
chomp($address);
# Check if the obtained address is valid.
if (&General::validip($address)) {
# Return the address.
return $address;
}
}
# Return nothing.
return;
}
# Function to check a given nameserver against propper work.
sub check_nameserver($$$$) {
my ($nameserver, $record, $proto, $tls_hostname) = @_;