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>

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 868ba715c5b9697c48e7b24c630aa302e897cda6..f030fdaa09b6dd1345c54e81bc84325f900d2bb3 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -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

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index a0930c36018332727f7439f821e92e20a91f49c7..2c5fc31d6371f0165aa21e6ad29e19f2ddb9e08c 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -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

diff --git a/doc/language_issues.it b/doc/language_issues.it
index f8475d9e166fa2db38b9f48f33379f87a9c28a83..805bc1209fc7174a9ac073b73a2c801e9b815fef 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -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

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 9813b91b5e382bd32b878c08187923fa7056a48c..65670849e20998dc0ec4abc0aec9d891557900c7 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -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

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 868ba715c5b9697c48e7b24c630aa302e897cda6..f030fdaa09b6dd1345c54e81bc84325f900d2bb3 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -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

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 1b67fd2782e7778fa9c2102466066a1666db5fb0..68e7b9384d3bb89f0df046c0c16df9d15718b331 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -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

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 01334e294d97d902641a902afd24acbaddba74fb..b4f62790311629579b9877146a0f5e5efc98a904 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -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

diff --git a/doc/language_missings b/doc/language_missings
index 68d801c8d5abaed22c01b7b29757c6deaa330fac..80ea6a6463b86e3f75498e015a80779530c66066 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -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

diff --git a/html/cgi-bin/netexternal.cgi b/html/cgi-bin/netexternal.cgi
index 299612d4c799051bd7958eae685db19230edf14d..4393393e081f07326de37e0b7648c2c2d59683c4 100644 (file)
--- a/html/cgi-bin/netexternal.cgi
+++ b/html/cgi-bin/netexternal.cgi
@@ -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>

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 672b9651b3eb12701dedc14f6e5c50c83bf6639c..92bf6f8f35f5c7ee233fef22f70f130559bd3374 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -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',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index b3120dcc1b4d77c2a548dd3ecbb6eb17ce0ab30c..44696f8d61abdc16cfa8678f24f942d2aa895dee 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -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',