add GeoIP and rDNS information to used nameservers

Add GeoIP and rDNS information to DNS nameserver list at netexternal.cgi

Use newly implemented GeoIP function in /var/ipfire/geoip-functions.pl

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Peter Müller
2017-11-15 22:49:00 +01:00
committed by Michael Tremer
parent 2aec53386a
commit 297110d460
11 changed files with 39 additions and 1 deletions

View File

@@ -1115,6 +1115,7 @@ WARNING: untranslated string: proxy reports today
WARNING: untranslated string: proxy reports weekly
WARNING: untranslated string: qos enter bandwidths
WARNING: untranslated string: random number generator daemon
WARNING: untranslated string: rdns
WARNING: untranslated string: red1
WARNING: untranslated string: required field
WARNING: untranslated string: route config changed

View File

@@ -1127,6 +1127,7 @@ WARNING: untranslated string: proxy reports today
WARNING: untranslated string: proxy reports weekly
WARNING: untranslated string: qos enter bandwidths
WARNING: untranslated string: random number generator daemon
WARNING: untranslated string: rdns
WARNING: untranslated string: red1
WARNING: untranslated string: required field
WARNING: untranslated string: route config changed

View File

@@ -859,6 +859,7 @@ WARNING: untranslated string: ovpn add conf
WARNING: untranslated string: pptp netconfig
WARNING: untranslated string: pptp peer
WARNING: untranslated string: pptp route
WARNING: untranslated string: rdns
WARNING: untranslated string: required field
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added

View File

@@ -900,6 +900,7 @@ WARNING: untranslated string: pptp netconfig
WARNING: untranslated string: pptp peer
WARNING: untranslated string: pptp route
WARNING: untranslated string: random number generator daemon
WARNING: untranslated string: rdns
WARNING: untranslated string: required field
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added

View File

@@ -1115,6 +1115,7 @@ WARNING: untranslated string: proxy reports today
WARNING: untranslated string: proxy reports weekly
WARNING: untranslated string: qos enter bandwidths
WARNING: untranslated string: random number generator daemon
WARNING: untranslated string: rdns
WARNING: untranslated string: red1
WARNING: untranslated string: required field
WARNING: untranslated string: route config changed

View File

@@ -1111,6 +1111,7 @@ WARNING: untranslated string: proxy reports today
WARNING: untranslated string: proxy reports weekly
WARNING: untranslated string: qos enter bandwidths
WARNING: untranslated string: random number generator daemon
WARNING: untranslated string: rdns
WARNING: untranslated string: red1
WARNING: untranslated string: required field
WARNING: untranslated string: route config changed

View File

@@ -800,6 +800,7 @@ WARNING: untranslated string: one hour
WARNING: untranslated string: one month
WARNING: untranslated string: one week
WARNING: untranslated string: one year
WARNING: untranslated string: rdns
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed

View File

@@ -544,6 +544,7 @@
< proxy reports weekly
< qos enter bandwidths
< random number generator daemon
< rdns
< red1
< required field
< samba join a domain
@@ -1255,6 +1256,7 @@
< proxy reports weekly
< qos enter bandwidths
< random number generator daemon
< rdns
< red1
< required field
< samba join a domain
@@ -1931,6 +1933,7 @@
< proxy reports weekly
< qos enter bandwidths
< random number generator daemon
< rdns
< red1
< required field
< samba join a domain
@@ -2610,6 +2613,7 @@
< proxy reports weekly
< qos enter bandwidths
< random number generator daemon
< rdns
< red1
< required field
< samba join a domain

View File

@@ -25,9 +25,12 @@ use strict;
#use warnings;
#use CGI::Carp 'fatalsToBrowser';
use IO::Socket;
require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
require "${General::swroot}/geoip-functions.pl";
require "${General::swroot}/graphs.pl";
my %color = ();
@@ -98,6 +101,12 @@ if ( $querry[0] ne~ ""){
<th align="center">
<strong>$Lang::tr{'nameserver'}</strong>
</th>
<th align="center">
<strong>$Lang::tr{'country'}</strong>
</th>
<th align="center">
<strong>$Lang::tr{'rdns'}</strong>
</th>
<th align="center">
<strong>$Lang::tr{'status'}</strong>
</th>
@@ -139,9 +148,25 @@ END
my $table_colour = ($id++ % 2) ? $color{'color22'} : $color{'color20'};
# collect more information about name server (rDNS, GeoIP country code)
my $ccode = &GeoIP::lookup($nameserver);
my $flag_icon = &GeoIP::get_flag_icon($ccode);
my $iaddr = inet_aton($nameserver);
my $rdns = gethostbyaddr($iaddr, AF_INET);
if (!$rdns) { $rdns = $Lang::tr{'lookup failed'}; }
print <<END;
<tr bgcolor="$table_colour">
<td>$nameserver</td>
<td>
$nameserver
</td>
<td align="center">
<a href='country.cgi#$ccode'><img src="$flag_icon" border="0" alt="$ccode" title="$ccode" /></a>
</td>
<td align="center">
$rdns
</td>
<td bgcolor="$bgcolour" align="center">
<font color="$colour"><strong>$message</strong></font>
</td>

View File

@@ -1961,6 +1961,7 @@
'quick playlist' => 'Quick Playlist',
'ram' => 'RAM-Speicher',
'random number generator daemon' => 'Random Number Generator Daemon',
'rdns' => 'rDNS',
'read bytes' => 'Gelesene Bytes',
'read list' => 'Liste der Leseberechtigten',
'real address' => 'Reale Addresse',

View File

@@ -1999,6 +1999,7 @@
'quick playlist' => 'Quick Playlist',
'ram' => 'RAM',
'random number generator daemon' => 'Random Number Generator Daemon',
'rdns' => 'rDNS',
'read bytes' => 'Read Bytes',
'read list' => 'list with readonly hosts',
'real address' => 'Real Address',