X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Fconnections.cgi;h=e9e9e335cfe4356b8509b5a79b1f482562e51e6c;hb=a4e5b80b91132e324e8c1caee1abb2e43a8ee706;hp=c7220f62d164b46dc2c63b34178cdc2e0df2f600;hpb=82a4a102f3eaa4d1d706a654cb940596714871d2;p=ipfire-2.x.git

diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi
index c7220f62d1..e9e9e335cf 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";
 
 my $colour_multicast = "#A0A0A0";
 
@@ -238,21 +239,42 @@ if (-e "${General::swroot}/ovpn/settings") {
 	}
 }
 
+# Add OpenVPN net for custom OVPNs
+if (-e "${General::swroot}/ovpn/ccd.conf") {
+	open(OVPNSUB, "${General::swroot}/ovpn/ccd.conf");	
+	my @ovpnsub = <OVPNSUB>;
+	close(OVPNSUB);
+
+	foreach (@ovpnsub) {
+		my ($network, $mask) = split '/', (split ',', $_)[2];
+		
+		$mask = ipv4_cidr2msk($mask) unless &General::validip($mask);
+
+		push(@network, $network);
+		push(@masklen, $mask);
+		push(@colour, ${Header::colourovpn});
+	}
+}
+
 open(IPSEC, "${General::swroot}/vpn/config");
 my @ipsec = <IPSEC>;
 close(IPSEC);
 
 foreach my $line (@ipsec) {
 	my @vpn = split(',', $line);
-	my ($network, $mask) = split("/", $vpn[12]);
 
-	if (!&General::validip($mask)) {
-		$mask = ipv4_cidr2msk($mask);
-	}
+	my @subnets = split(/\|/, $vpn[12]);
+	for my $subnet (@subnets) {
+		my ($network, $mask) = split("/", $subnet);
 
-	push(@network, $network);
-	push(@masklen, $mask);
-	push(@colour, ${Header::colourvpn});
+		if (!&General::validip($mask)) {
+			$mask = ipv4_cidr2msk($mask);
+		}
+
+		push(@network, $network);
+		push(@masklen, $mask);
+		push(@colour, ${Header::colourvpn});
+	}
 }
 
 if (-e "${General::swroot}/ovpn/n2nconf") {
@@ -358,6 +380,7 @@ print <<END;
 				<a href="?sort_field=3&amp;sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
 				<a href="?sort_field=3&amp;sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
 			</th>
+			<th>&nbsp;</th>
 			<th style='text-align:center' colspan='2'>
 				<a href="?sort_field=2&amp;sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
 				<a href="?sort_field=2&amp;sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
@@ -365,6 +388,7 @@ print <<END;
 				<a href="?sort_field=4&amp;sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
 				<a href="?sort_field=4&amp;sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
 			</th>
+			<th>&nbsp;</th>
 			<th style='text-align:center'>
 				<a href="?sort_field=8&amp;sort_order=d"><img style="width:10px" src="/images/up.gif" alt=""></a>
 				<a href="?sort_field=8&amp;sort_order=a"><img style="width:10px" src="/images/down.gif" alt=""></a>
@@ -388,9 +412,15 @@ print <<END;
 			<th style='text-align:center' colspan='2'>
 				$Lang::tr{'source ip and port'}
 			</th>
+			<th style='text-align:center'>
+				$Lang::tr{'country'}
+			</th>
 			<th style='text-align:center' colspan='2'>
 				$Lang::tr{'dest ip and port'}
 			</th>
+			<th style='text-align:center'>
+				$Lang::tr{'country'}
+			</th>
 			<th style='text-align:center'>
 				$Lang::tr{'download'} /
 				<br>$Lang::tr{'upload'}
@@ -503,7 +533,8 @@ foreach my $line (@conntrack) {
 	}
 
 	my $sip_colour = ipcolour($sip);
-	my $dip_colour = ipcolour($dip);
+	# use colour of destination network for DNAT
+	my $dip_colour = $dip ne $dip_ret ? ipcolour($dip_ret) : ipcolour($dip);
 
 	my $sserv = '';
 	if ($sport < 1024) {
@@ -518,11 +549,17 @@ foreach my $line (@conntrack) {
 	my $bytes_in = format_bytes($bytes[0]);
 	my $bytes_out = format_bytes($bytes[1]);
 
+	# enumerate GeoIP information
+	my $srcccode = &GeoIP::lookup($sip_ret);
+	my $src_flag_icon = &GeoIP::get_flag_icon($srcccode);
+	my $dstccode = &GeoIP::lookup($dip_ret);
+	my $dst_flag_icon = &GeoIP::get_flag_icon($dstccode);
+
 	# Format TTL
 	$ttl = format_time($ttl);
 
 	my $sip_extra;
-	if ($sip ne $sip_ret) {
+	if ($sip_ret && $sip ne $sip_ret) {
 		$sip_extra = "<span style='color:#FFFFFF;'>&gt;</span> ";
 		$sip_extra .= "<a href='/cgi-bin/ipinfo.cgi?ip=$sip_ret'>";
 		$sip_extra .= "	<span style='color:#FFFFFF;'>$sip_ret</span>";
@@ -530,7 +567,7 @@ foreach my $line (@conntrack) {
 	}
 
 	my $dip_extra;
-	if ($dip ne $dip_ret) {
+	if ($dip_ret && $dip ne $dip_ret) {
 		$dip_extra = "<span style='color:#FFFFFF;'>&gt;</span> ";
 		$dip_extra .= "<a href='/cgi-bin/ipinfo.cgi?ip=$dip_ret'>";
 		$dip_extra .= " <span style='color:#FFFFFF;'>$dip_ret</span>";
@@ -579,6 +616,9 @@ foreach my $line (@conntrack) {
 			</a>
 			$sport_extra
 		</td>
+		<td style='text-align:center; background-color:$sip_colour;'>
+			<a href='country.cgi#$srcccode'><img src='$src_flag_icon' border='0' align='absmiddle' alt='$srcccode' title='$srcccode' /></a>
+		</td>
 		<td style='text-align:center; background-color:$dip_colour;'>
 			<a href='/cgi-bin/ipinfo.cgi?ip=$dip'>
 				<span style='color:#FFFFFF;'>$dip</span>
@@ -591,6 +631,9 @@ foreach my $line (@conntrack) {
 			</a>
 			$dport_extra
 		</td>
+		<td style='text-align:center; background-color:$sip_colour;'>
+			<a href='country.cgi#$dstccode'><img src='$dst_flag_icon' border='0' align='absmiddle' alt='$dstccode' title='$dstccode' /></a>
+		</td>
 		<td style='text-align:center'>
 			$bytes_in / $bytes_out
 		</td>
@@ -643,15 +686,17 @@ sub ipcolour($) {
 	my ($ip) = $_[0];
 	my $found = 0;
 
-	foreach my $line (@network) {
-		if ($network[$id] eq '') {
-			$id++;
-		} else {
-			if (!$found && ipv4_in_network($network[$id], $masklen[$id], $ip) ) {
-				$found = 1;
-				$colour = $colour[$id];
+	if ($ip) {
+		foreach my $line (@network) {
+			if ($network[$id] eq '') {
+				$id++;
+			} else {
+				if (!$found && ipv4_in_network($network[$id], $masklen[$id], $ip) ) {
+					$found = 1;
+					$colour = $colour[$id];
+				}
+				$id++;
 			}
-			$id++;
 		}
 	}