From mboxrd@z Thu Jan  1 00:00:00 1970
From: Peter =?utf-8?q?M=C3=BCller?= <peter.mueller@link38.eu>
To: development@lists.ipfire.org
Subject: [PATCH v2] display GeoIP information on active network connections
Date: Wed, 15 Nov 2017 23:10:43 +0100
Message-ID: <20171115231043.501e6f36.peter.mueller@link38.eu>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5269806916008616577=="
List-Id: <development.lists.ipfire.org>

--===============5269806916008616577==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Display GeoIP information on active network connections in WebUI.
Use newly implemented function in /var/ipfire/geoip-functions.pl .

Signed-off-by: Peter M=C3=BCller <peter.mueller(a)link38.eu>
---
 html/cgi-bin/connections.cgi | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi
index 96f09012b..e9e9e335c 100644
--- a/html/cgi-bin/connections.cgi
+++ b/html/cgi-bin/connections.cgi
@@ -31,6 +31,7 @@ use Switch;
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
+require "${General::swroot}/geoip-functions.pl";
=20
 my $colour_multicast =3D "#A0A0A0";
=20
@@ -379,6 +380,7 @@ print <<END;
 				<a href=3D"?sort_field=3D3&amp;sort_order=3Dd"><img style=3D"width:10px"=
 src=3D"/images/up.gif" alt=3D""></a>
 				<a href=3D"?sort_field=3D3&amp;sort_order=3Da"><img style=3D"width:10px"=
 src=3D"/images/down.gif" alt=3D""></a>
 			</th>
+			<th>&nbsp;</th>
 			<th style=3D'text-align:center' colspan=3D'2'>
 				<a href=3D"?sort_field=3D2&amp;sort_order=3Dd"><img style=3D"width:10px"=
 src=3D"/images/up.gif" alt=3D""></a>
 				<a href=3D"?sort_field=3D2&amp;sort_order=3Da"><img style=3D"width:10px"=
 src=3D"/images/down.gif" alt=3D""></a>
@@ -386,6 +388,7 @@ print <<END;
 				<a href=3D"?sort_field=3D4&amp;sort_order=3Dd"><img style=3D"width:10px"=
 src=3D"/images/up.gif" alt=3D""></a>
 				<a href=3D"?sort_field=3D4&amp;sort_order=3Da"><img style=3D"width:10px"=
 src=3D"/images/down.gif" alt=3D""></a>
 			</th>
+			<th>&nbsp;</th>
 			<th style=3D'text-align:center'>
 				<a href=3D"?sort_field=3D8&amp;sort_order=3Dd"><img style=3D"width:10px"=
 src=3D"/images/up.gif" alt=3D""></a>
 				<a href=3D"?sort_field=3D8&amp;sort_order=3Da"><img style=3D"width:10px"=
 src=3D"/images/down.gif" alt=3D""></a>
@@ -409,10 +412,16 @@ print <<END;
 			<th style=3D'text-align:center' colspan=3D'2'>
 				$Lang::tr{'source ip and port'}
 			</th>
+			<th style=3D'text-align:center'>
+				$Lang::tr{'country'}
+			</th>
 			<th style=3D'text-align:center' colspan=3D'2'>
 				$Lang::tr{'dest ip and port'}
 			</th>
 			<th style=3D'text-align:center'>
+				$Lang::tr{'country'}
+			</th>
+			<th style=3D'text-align:center'>
 				$Lang::tr{'download'} /
 				<br>$Lang::tr{'upload'}
 			</th>
@@ -540,6 +549,12 @@ foreach my $line (@conntrack) {
 	my $bytes_in =3D format_bytes($bytes[0]);
 	my $bytes_out =3D format_bytes($bytes[1]);
=20
+	# enumerate GeoIP information
+	my $srcccode =3D &GeoIP::lookup($sip_ret);
+	my $src_flag_icon =3D &GeoIP::get_flag_icon($srcccode);
+	my $dstccode =3D &GeoIP::lookup($dip_ret);
+	my $dst_flag_icon =3D &GeoIP::get_flag_icon($dstccode);
+
 	# Format TTL
 	$ttl =3D format_time($ttl);
=20
@@ -601,6 +616,9 @@ foreach my $line (@conntrack) {
 			</a>
 			$sport_extra
 		</td>
+		<td style=3D'text-align:center; background-color:$sip_colour;'>
+			<a href=3D'country.cgi#$srcccode'><img src=3D'$src_flag_icon' border=3D'0=
' align=3D'absmiddle' alt=3D'$srcccode' title=3D'$srcccode' /></a>
+		</td>
 		<td style=3D'text-align:center; background-color:$dip_colour;'>
 			<a href=3D'/cgi-bin/ipinfo.cgi?ip=3D$dip'>
 				<span style=3D'color:#FFFFFF;'>$dip</span>
@@ -613,6 +631,9 @@ foreach my $line (@conntrack) {
 			</a>
 			$dport_extra
 		</td>
+		<td style=3D'text-align:center; background-color:$sip_colour;'>
+			<a href=3D'country.cgi#$dstccode'><img src=3D'$dst_flag_icon' border=3D'0=
' align=3D'absmiddle' alt=3D'$dstccode' title=3D'$dstccode' /></a>
+		</td>
 		<td style=3D'text-align:center'>
 			$bytes_in / $bytes_out
 		</td>
--=20
2.13.6

--===============5269806916008616577==--