]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blobdiff - html/cgi-bin/connections.cgi
Fix connection.cgi display for strongswan.
[people/pmueller/ipfire-2.x.git] / html / cgi-bin / connections.cgi
index 36bbaf0ded2080df6315e27efe2fe4bb81a41071..b370d12881ef8bec2bf208c0d64efc013d66e8bb 100644 (file)
@@ -1,13 +1,23 @@
 #!/usr/bin/perl
-#
-# (c) 2001 Jack Beglinger <jackb_guppy@yahoo.com>
-#
-# (c) 2003 Dave Roberts <countzerouk@hotmail.com> - colour coded netfilter/iptables rewrite for 1.3
-#
-# $Id: connections.cgi,v 1.6.2.11 2005/02/24 07:44:35 gespinasse Exp $
-#
-
-# Setup GREEN, ORANGE, IPCOP, VPN CIDR networks, masklengths and colours only once
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
 
 my @network=();
 my @masklen=();
@@ -21,7 +31,7 @@ use strict;
 #use warnings;
 #use CGI::Carp 'fatalsToBrowser';
 
-require 'CONFIG_ROOT/general-functions.pl';
+require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
@@ -34,12 +44,28 @@ undef (@dummy);
 my %netsettings=();
 &General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
 
-open (ACTIVE, "/proc/net/ip_conntrack") or die 'Unable to open ip_conntrack';
+open (ACTIVE, '/usr/local/bin/getiptstate |') or die 'Unable to open ip_conntrack';
 my @active = <ACTIVE>;
 close (ACTIVE);
 
-my @vpn = ('none');
-open (ACTIVE, "/proc/net/ipsec_eroute") and @vpn = <ACTIVE>; close (ACTIVE);
+if (open(IP, "${General::swroot}/red/local-ipaddress")) {
+        my $redip = <IP>;
+        close(IP);
+        chomp $redip;
+        push(@network, $redip);
+        push(@masklen, '255.255.255.255' );
+        push(@colour, ${Header::colourfw} );
+}
+
+my @vpn = `grep "rightsubnet=" /etc/ipsec.conf | cut -f2 -d"=" | sed "s|/| |g"`;
+  foreach my $route (@vpn) {
+                chomp($route);
+                my @temp = split(/[\t ]+/, $route);
+                if ( $temp[0] eq '$redip' ){next;}
+                push(@network, $temp[0]);
+                push(@masklen, $temp[1]);
+                push(@colour, ${Header::colourvpn} );
+        }
 
 my $aliasfile = "${General::swroot}/ethernet/aliases";
 open(ALIASES, $aliasfile) or die 'Unable to open aliases file.';
@@ -59,11 +85,11 @@ push(@colour, ${Header::colourgreen} );
 # Add Green Routes to Array
 my @routes = `/sbin/route -n | /bin/grep $netsettings{'GREEN_DEV'}`;
 foreach my $route (@routes) {
-       chomp($route);
-       my @temp = split(/[\t ]+/, $route);
-       push(@network, $temp[0]);
-       push(@masklen, $temp[2]);
-       push(@colour, ${Header::colourgreen} );
+        chomp($route);
+        my @temp = split(/[\t ]+/, $route);
+        push(@network, $temp[0]);
+        push(@masklen, $temp[2]);
+        push(@colour, ${Header::colourgreen} );
 }
 
 # Add Firewall Localhost 127.0.0.1
@@ -73,257 +99,325 @@ push(@colour, ${Header::colourfw} );
 
 # Add Orange Network
 if ($netsettings{'ORANGE_DEV'}) {
-       push(@network, $netsettings{'ORANGE_NETADDRESS'});
-       push(@masklen, $netsettings{'ORANGE_NETMASK'} );
-       push(@colour, ${Header::colourorange} );
-       # Add Orange Routes to Array
-       @routes = `/sbin/route -n | /bin/grep $netsettings{'ORANGE_DEV'}`;
-       foreach my $route (@routes) {
-               chomp($route);
-               my @temp = split(/[\t ]+/, $route);
-               push(@network, $temp[0]);
-               push(@masklen, $temp[2]);
-               push(@colour, ${Header::colourorange} );
-       }
+        push(@network, $netsettings{'ORANGE_NETADDRESS'});
+        push(@masklen, $netsettings{'ORANGE_NETMASK'} );
+        push(@colour, ${Header::colourorange} );
+        # Add Orange Routes to Array
+        @routes = `/sbin/route -n | /bin/grep $netsettings{'ORANGE_DEV'}`;
+        foreach my $route (@routes) {
+                  chomp($route);
+                my @temp = split(/[\t ]+/, $route);
+                push(@network, $temp[0]);
+                push(@masklen, $temp[2]);
+                push(@colour, ${Header::colourorange} );
+        }
 }
 
+# Add Blue Firewall Interface
+push(@network, $netsettings{'BLUE_ADDRESS'});
+push(@masklen, "255.255.255.255" );
+push(@colour, ${Header::colourfw} );
+
 # Add Blue Network
 if ($netsettings{'BLUE_DEV'}) {
-       push(@network, $netsettings{'BLUE_NETADDRESS'});
-       push(@masklen, $netsettings{'BLUE_NETMASK'} );
-       push(@colour, ${Header::colourblue} );
-       # Add Blue Routes to Array
-       @routes = `/sbin/route -n | /bin/grep $netsettings{'BLUE_DEV'}`;
-       foreach my $route (@routes) {
-               chomp($route);
-               my @temp = split(/[\t ]+/, $route);
-               push(@network, $temp[0]);
-               push(@masklen, $temp[2]);
-               push(@colour, ${Header::colourblue} );
-       }
+        push(@network, $netsettings{'BLUE_NETADDRESS'});
+        push(@masklen, $netsettings{'BLUE_NETMASK'} );
+        push(@colour, ${Header::colourblue} );
+        # Add Blue Routes to Array
+        @routes = `/sbin/route -n | /bin/grep $netsettings{'BLUE_DEV'}`;
+        foreach my $route (@routes) {
+                  chomp($route);
+                my @temp = split(/[\t ]+/, $route);
+                push(@network, $temp[0]);
+                push(@masklen, $temp[2]);
+                push(@colour, ${Header::colourblue} );
+        }
+}
+
+# Add OpenVPN net and RED/BLUE/ORANGE entry (when appropriate)
+if (-e "${General::swroot}/ovpn/settings") {
+    my %ovpnsettings = ();    
+    &General::readhash("${General::swroot}/ovpn/settings", \%ovpnsettings);
+    my @tempovpnsubnet = split("\/",$ovpnsettings{'DOVPN_SUBNET'});
+
+    # add OpenVPN net
+                push(@network, $tempovpnsubnet[0]);
+                push(@masklen, $tempovpnsubnet[1]);
+                push(@colour, ${Header::colourovpn} );
+
+
+    if ( ($ovpnsettings{'ENABLED_BLUE'} eq 'on') && $netsettings{'BLUE_DEV'} ) {
+      # add BLUE:port / proto
+            push(@network, $netsettings{'BLUE_ADDRESS'} );
+            push(@masklen, '255.255.255.255' );
+                  push(@colour, ${Header::colourovpn} );
+    }
+    if ( ($ovpnsettings{'ENABLED_ORANGE'} eq 'on') && $netsettings{'ORANGE_DEV'} ) {
+      # add ORANGE:port / proto
+            push(@network, $netsettings{'ORANGE_ADDRESS'} );
+            push(@masklen, '255.255.255.255' );
+                  push(@colour, ${Header::colourovpn} );
+    }
 }
 
 # Add STATIC RED aliases
 if ($netsettings{'RED_DEV'}) {
-       # We have a RED eth iface
-       if ($netsettings{'RED_TYPE'} eq 'STATIC') {
-               # We have a STATIC RED eth iface
-               foreach my $line (@aliases)
-               {
-                       chomp($line);
-                       my @temp = split(/\,/,$line);
-                       if ( $temp[0] ) {
-                               push(@network, $temp[0]);
-                               push(@masklen, $netsettings{'RED_NETMASK'} );
-                               push(@colour, ${Header::colourfw} );
-                       }
-               }
-       }
+        # We have a RED eth iface
+        if ($netsettings{'RED_TYPE'} eq 'STATIC') {
+                # We have a STATIC RED eth iface
+                foreach my $line (@aliases)
+                {
+                        chomp($line);
+                        my @temp = split(/\,/,$line);
+                        if ( $temp[0] ) {
+                                push(@network, $temp[0]);
+                                push(@masklen, $netsettings{'RED_NETMASK'} );
+                                push(@colour, ${Header::colourfw} );
+                        }
+                }
+        }
 }
 
 # Add VPNs
 if ( $vpn[0] ne 'none' ) {
-       foreach my $line (@vpn) {
-               my @temp = split(/[\t ]+/,$line);
-               my @temp1 = split(/[\/:]+/,$temp[3]);
-               push(@network, $temp1[0]);
-               push(@masklen, ipv4_cidr2msk($temp1[1]));
-               push(@colour, ${Header::colourvpn} );
-       }
-}
-if (open(IP, "${General::swroot}/red/local-ipaddress")) {
-       my $redip = <IP>;
-       close(IP);
-       chomp $redip;
-       push(@network, $redip);
-       push(@masklen, '255.255.255.255' );
-       push(@colour, ${Header::colourfw} );
+        foreach my $line (@vpn) {
+                my @temp = split(/[\t ]+/,$line);
+                my @temp1 = split(/[\/:]+/,$temp[3]);
+                push(@network, $temp1[0]);
+                push(@masklen, ipv4_cidr2msk($temp1[1]));
+                push(@colour, ${Header::colourvpn} );
+        }
 }
 
+#Establish simple filtering&sorting boxes on top of table
+
+our %cgiparams;
+&Header::getcgihash(\%cgiparams);
+
+my @list_proto = ($Lang::tr{'all'}, 'icmp', 'udp', 'tcp');
+my @list_state = ($Lang::tr{'all'}, 'SYN_SENT', 'SYN_RECV', 'ESTABLISHED', 'FIN_WAIT',
+                    'CLOSE_WAIT', 'LAST_ACK', 'TIME_WAIT', 'CLOSE', 'LISTEN');
+my @list_mark = ($Lang::tr{'all'}, '[ASSURED]', '[UNREPLIED]');
+my @list_sort = ('orgsip','protocol', 'expires', 'status', 'orgdip', 'orgsp',
+                    'orgdp', 'exsip', 'exdip', 'exsp', 'exdp', 'marked');
+
+# init or silently correct unknown value...
+if ( ! grep ( /^$cgiparams{'SEE_PROTO'}$/ , @list_proto )) { $cgiparams{'SEE_PROTO'} = $list_proto[0] };
+if ( ! grep ( /^$cgiparams{'SEE_STATE'}$/ , @list_state )) { $cgiparams{'SEE_STATE'} = $list_state[0] };
+if ( ($cgiparams{'SEE_MARK'} ne $Lang::tr{'all'}) &&   # ok the grep should work but it doesn't because of
+     ($cgiparams{'SEE_MARK'} ne '[ASSURED]') &&                # the '[' & ']' interpreted as list separator.
+     ($cgiparams{'SEE_MARK'} ne '[UNREPLIED]')         # So, explicitly enumerate items.
+   )  { $cgiparams{'SEE_MARK'}  = $list_mark[0] };
+if ( ! grep ( /^$cgiparams{'SEE_SORT'}$/  , @list_sort ))  { $cgiparams{'SEE_SORT'}  = $list_sort[0] };
+# *.*.*.* or a valid IP
+if ( $cgiparams{'SEE_SRC'}  !~ /^(\*\.\*\.\*\.\*\.|\d+\.\d+\.\d+\.\d+)$/) {  $cgiparams{'SEE_SRC'} = '*.*.*.*' };
+if ( $cgiparams{'SEE_DEST'} !~ /^(\*\.\*\.\*\.\*\.|\d+\.\d+\.\d+\.\d+)$/) {  $cgiparams{'SEE_DEST'} = '*.*.*.*' };
+
+
+our %entries = ();     # will hold the lines analyzed correctly
+my $unknownlines = ''; # should be empty all the time...
+my $index = 0;         # just a counter to make unique entryies in entries
+
 &Header::showhttpheaders();
 &Header::openpage($Lang::tr{'connections'}, 1, '');
 &Header::openbigbox('100%', 'left');
 &Header::openbox('100%', 'left', $Lang::tr{'connection tracking'});
 
+# Build listbox objects
+my $menu_proto = &make_select ('SEE_PROTO', $cgiparams{'SEE_PROTO'}, @list_proto);
+my $menu_state = &make_select ('SEE_STATE', $cgiparams{'SEE_STATE'}, @list_state);
+
 print <<END
-<table width='60%'>
+<form method='post' action='$ENV{'SCRIPT_NAME'}'>
+<table width='100%'>
 <tr><td align='center'><b>$Lang::tr{'legend'} : </b></td>
-     <td align='center' bgcolor='${Header::colourgreen}'><b><font color='#FFFFFF'>$Lang::tr{'lan'}</font></b></td>
-     <td align='center' bgcolor='${Header::colourred}'><b><font color='#FFFFFF'>$Lang::tr{'internet'}</font></b></td>
-     <td align='center' bgcolor='${Header::colourorange}'><b><font color='#FFFFFF'>$Lang::tr{'dmz'}</font></b></td>
-     <td align='center' bgcolor='${Header::colourblue}'><b><font color='#FFFFFF'>$Lang::tr{'wireless'}</font></b></td>
-     <td align='center' bgcolor='${Header::colourfw}'><b><font color='#FFFFFF'>IPCop</font></b></td>
-     <td align='center' bgcolor='${Header::colourvpn}'><b><font color='#FFFFFF'>$Lang::tr{'vpn'}</font></b></td>
+    <td align='center' bgcolor='${Header::colourgreen}'><b><font color='#FFFFFF'>$Lang::tr{'lan'}</font></b></td>
+    <td align='center' bgcolor='${Header::colourred}'><b><font color='#FFFFFF'>$Lang::tr{'internet'}</font></b></td>
+    <td align='center' bgcolor='${Header::colourorange}'><b><font color='#FFFFFF'>$Lang::tr{'dmz'}</font></b></td>
+    <td align='center' bgcolor='${Header::colourblue}'><b><font color='#FFFFFF'>$Lang::tr{'wireless'}</font></b></td>
+    <td align='center' bgcolor='${Header::colourfw}'><b><font color='#FFFFFF'>IPFire</font></b></td>
+    <td align='center' bgcolor='${Header::colourvpn}'><b><font color='#FFFFFF'>$Lang::tr{'vpn'}</font></b></td>
+    <td align='center' bgcolor='${Header::colourovpn}'><b><font color='#FFFFFF'>$Lang::tr{'OpenVPN'}</font></b></td>
 </tr>
 </table>
 <br />
-<table cellpadding='2'>
-<tr><td align='center'><b>$Lang::tr{'protocol'}</b></td>
-    <td align='center'><b>$Lang::tr{'expires'}<br />($Lang::tr{'seconds'})</b></td>
-    <td align='center'><b>$Lang::tr{'connection'}<br />$Lang::tr{'status'}</b></td>
-    <td align='center'><b>$Lang::tr{'original'}<br />$Lang::tr{'source ip and port'}</b></td>
-    <td align='center'><b>$Lang::tr{'original'}<br />$Lang::tr{'dest ip and port'}</b></td>
-    <td align='center'><b>$Lang::tr{'expected'}<br />$Lang::tr{'source ip and port'}</b></td>
-    <td align='center'><b>$Lang::tr{'expected'}<br />$Lang::tr{'dest ip and port'}</b></td>
-    <td align='center'><b>$Lang::tr{'marked'}</b></td>
-    <td align='center'><b>$Lang::tr{'use'}</b></td>
+<table width='100%'>
+<tr><td align='center'><font size=2>$Lang::tr{'source ip and port'}</font></td>
+               <td>&nbsp;</td>
+               <td align='center'><font size=2>$Lang::tr{'dest ip and port'}</font></td>
+               <td>&nbsp;</td>
+               <td align='center'><font size=2>$Lang::tr{'protocol'}</font></td>
+               <td align='center'><font size=2>$Lang::tr{'connection'}<br></br>$Lang::tr{'status'}</font></td>
+    <td align='center'><font size=2>$Lang::tr{'expires'}<br></br>($Lang::tr{'seconds'})</font></td>
+    
+</tr>
+<tr><td colspan='4'>&nbsp;</td>
+               <td align='center'>$menu_proto</td>
+    <td align='center'>$menu_state</td>
+    <td>&nbsp;</td>
 </tr>
+<tr>
+    <td align='center' colspan='7'></td>
+</tr>
+<tr>
+    <td align='center' colspan='7'><input type='submit' value="$Lang::tr{'update'}" /></td>
+</tr>
+
 END
 ;
 
-foreach my $line (@active)
-{
-       my $protocol='';
-       my $expires='';
-       my $connstatus='';
-       my $orgsip='';
-       my $orgdip='';
-       my $orgsp='';
-       my $orgdp='';
-       my $exsip='';
-       my $exdip='';
-       my $exsp='';
-       my $exdp='';
-       my $marked='';
-       my $use='';
-       my $orgsipcolour='';
-       my $orgdipcolour='';
-       my $exsipcolour='';
-       my $exdipcolour='';
-
-       chomp($line);
-       my @temp = split(' ',$line);
-       print "<tr bgcolor='${Header::table1colour}'>\n";
-       if ($temp[0] eq 'udp') {
-               my $offset = 0;
-               $marked = '';
-               $protocol = $temp[0] . " (" . $temp[1] . ")";
-               $expires = $temp[2];
-               $connstatus = ' ';
-               $orgsip = substr $temp[3], 4;
-               $orgdip = substr $temp[4], 4;
-               $orgsp = substr $temp[5], 6;
-               $orgdp = substr $temp[6], 6;
-               if ($temp[7] eq '[UNREPLIED]') {
-                        $marked = $temp[7];
-                        $offset = 1;
-                }
-                else {
-                        $connstatus = ' ';
-                }
+my $i=0;
+foreach my $line (@active) {
+    $i++;
+    if ($i < 3) {
+                       next;
+    }
+    chomp($line);
+    my @temp = split(' ',$line);
 
-               $exsip = substr $temp[7 + $offset], 4;
-               $exdip = substr $temp[8 + $offset], 4;
-               $exsp = substr $temp[9 + $offset], 6;
-               $exdp = substr $temp[10 + $offset], 6;
-               if ($marked eq '[UNREPLIED]') {
-                       $use = substr $temp[11 + $offset], 4;
-                }
-                else {
-                        $marked = $temp[11 + $offset];
-                       $use = substr $marked, 0, 3;
-                       if ($use eq 'use' ) {
-                               $marked = '';
-                               $use = substr $temp[11 + $offset], 4;
-                       }
-                       else {
-                               $use = substr $temp[12 + $offset], 4;
-                       }
-               }
+    my ($sip, $sport) = split(':', $temp[0]);
+    my ($dip, $dport) = split(':', $temp[1]);
+    my $proto = $temp[2];
+    my $state; my $ttl;
+    if ( $proto eq "esp" ){$state = "";$ttl = $temp[3];}
+    elsif ( $proto eq "icmp" ){$state = "";$ttl = $temp[4];}
+    else{$state = $temp[3];$ttl = $temp[4];}
+    
+    next if( !(
+                       (($cgiparams{'SEE_PROTO'}  eq $Lang::tr{'all'}) || ($proto  eq $cgiparams{'SEE_PROTO'} ))
+                && (($cgiparams{'SEE_STATE'}  eq $Lang::tr{'all'}) || ($state  eq $cgiparams{'SEE_STATE'} ))
+               && (($cgiparams{'SEE_SRC'}    eq "*.*.*.*")        || ($sip    eq $cgiparams{'SEE_SRC'}   ))
+               && (($cgiparams{'SEE_DEST'}   eq "*.*.*.*")       || ($dip    eq $cgiparams{'SEE_DEST'}  ))
+              ));
+
+    if (($proto eq 'udp') && ($ttl eq '')) {
+                       $ttl = $state;
+                       $state = '&nbsp;';      
+    }
+
+    my $sipcol = ipcolour($sip);
+    my $dipcol = ipcolour($dip);
+
+    my $sserv = '';
+    if ($sport < 1024) {
+       $sserv = uc(getservbyport($sport, lc($proto)));
+       if ($sserv ne '') {
+           $sserv = "&nbsp;($sserv)";
        }
-       if ($temp[0] eq 'tcp') {
-               my $offset = 0;
-                $protocol = $temp[0] . " (" . $temp[1] . ")";
-                $expires = $temp[2];
-                $connstatus = $temp[3];
-                $orgsip = substr $temp[4], 4;
-                $orgdip = substr $temp[5], 4;
-                $orgsp = substr $temp[6], 6;
-               $orgdp = substr $temp[7], 6;
-               if ($temp[8] eq '[UNREPLIED]') {
-                        $marked = $temp[8];
-                        $offset = 1;
-                       $use = substr $temp[13], 4;
-                }
-                else {
-                        $marked = $temp[12];
-                       $use = substr $temp[13], 4;
-                }
-               
-               $exsip = substr $temp[8 + $offset], 4;
-                $exdip = substr $temp[9 + $offset], 4;
-                $exsp = substr $temp[10 + $offset], 6;
-                $exdp = substr $temp[11 + $offset], 6;
-        }
-       if ($temp[0] eq 'unknown') {
-                my $offset = 0;
-                $protocol = "??? (" . $temp[1] . ")";
-                $protocol = "esp (" . $temp[1] . ")" if ($temp[1] == 50);
-                $protocol = " ah (" . $temp[1] . ")" if ($temp[1] == 51);
-                $expires = $temp[2];
-                $connstatus = ' ';
-                $orgsip = substr $temp[3], 4;
-                $orgdip = substr $temp[4], 4;
-                $orgsp = ' ';
-                $orgdp = ' ';
-                $exsip = substr $temp[5], 4;
-                $exdip = substr $temp[6], 4;
-                $exsp = ' ';
-                $exdp = ' ';
-                $marked = ' ';
-                $use = ' ';
-        }
-       if ($temp[0] eq 'gre') {
-                my $offset = 0;
-               $protocol = $temp[0] . " (" . $temp[1] . ")";
-                $expires = $temp[2];
-                $orgsip = substr $temp[5], 4;
-                $orgdip = substr $temp[6], 4;
-                $orgsp = ' ';
-               $orgdp = ' ';
-               $exsip = substr $temp[11], 4;
-                $exdip = substr $temp[12], 4;
-                $exsp = ' ';
-                $exdp = ' ';
-               $marked = $temp[17];
-               $use = $temp[18];
+    }
+
+    my $dserv = '';
+    if ($dport < 1024) {
+       $dserv = uc(getservbyport($dport, lc($proto)));
+       if ($dserv ne '') {
+           $dserv = "&nbsp;($dserv)";
        }
-       $orgsipcolour = &ipcolour($orgsip);
-       $orgdipcolour = &ipcolour($orgdip);
-       $exsipcolour = &ipcolour($exsip);
-       $exdipcolour = &ipcolour($exdip);
-       print <<END
-       <td align='center'>$protocol</td>
-       <td align='center'>$expires</td>
-       <td align='center'>$connstatus</td>
-       <td align='center' bgcolor='$orgsipcolour'><a href='/cgi-bin/ipinfo.cgi?ip=$orgsip'><font color='#FFFFFF'>$orgsip</font></a><font color='#FFFFFF'>:$orgsp</font></td>
-       <td align='center' bgcolor='$orgdipcolour'><a href='/cgi-bin/ipinfo.cgi?ip=$orgdip'><font color='#FFFFFF'>$orgdip</font></a><font color='#FFFFFF'>:$orgdp</font></td>
-       <td align='center' bgcolor='$exsipcolour'><a href='/cgi-bin/ipinfo.cgi?ip=$exsip'><font color='#FFFFFF'>$exsip</font></a><font color='#FFFFFF'>:$exsp</font></td>
-       <td align='center' bgcolor='$exdipcolour'><a href='/cgi-bin/ipinfo.cgi?ip=$exdip'><font color='#FFFFFF'>$exdip</font></a><font color='#FFFFFF'>:$exdp</font></td>
-       <td align='center'>$marked</td><td align='center'>$use</td>
-       </tr>
+    }
+
+    print <<END
+    <tr >
+      <td align='center' bgcolor='$sipcol'>
+        <a href='/cgi-bin/ipinfo.cgi?ip=$sip'>
+          <font color='#FFFFFF'>$sip</font>
+        </a>
+      </td>
+      <td align='center' bgcolor='$sipcol'>
+        <a href='http://isc.sans.org/port_details.php?port=$sport' target='top'>
+          <font color='#FFFFFF'>$sport$sserv</font>
+        </a>
+      </td>
+      <td align='center' bgcolor='$dipcol'>
+        <a href='/cgi-bin/ipinfo.cgi?ip=$dip'>
+          <font color='#FFFFFF'>$dip</font>
+        </a>
+      </td>
+      <td align='center' bgcolor='$dipcol'>
+        <a href='http://isc.sans.org/port_details.php?port=$dport' target='top'>
+          <font color='#FFFFFF'>$dport$dserv</font>
+        </a>
+      </td>
+      <td align='center'>$proto</td>
+      <td align='center'>$state</td>
+      <td align='center'>$ttl</td>
+    </tr>
 END
-       ;
+;
 }
-print "</table>\n";
+
+print "</table></form>";
 
 &Header::closebox();
 &Header::closebigbox();
 &Header::closepage();
 
 sub ipcolour($) {
-       my $id = 0;
-       my $line;
-       my $colour = ${Header::colourred};
-       my ($ip) = $_[0];
-       my $found = 0;
-       foreach $line (@network)
-       {
-               if (!$found && ipv4_in_network( $network[$id] , $masklen[$id], $ip) ) {
-                       $found = 1;
-                       $colour = $colour[$id];
-               }
-               $id++;
-       }
-       return $colour
+        my $id = 0;
+        my $line;
+        my $colour = ${Header::colourred};
+        my ($ip) = $_[0];
+        my $found = 0;
+        foreach $line (@network) {
+                                       if ($network[$id] eq '') {
+                                               $id++;
+                                       } else {
+                                               if (!$found && ipv4_in_network( $network[$id] , $masklen[$id], $ip) ) {
+                                                       $found = 1;
+                                                       $colour = $colour[$id];
+                                               }
+                                               $id++;
+                                       }
+        }
+        return $colour
+}
+
+# Create a string containing a complete SELECT html object 
+# param1: name
+# param2: current value selected
+# param3: field list
+sub make_select ($,$,$) {
+        my $select_name = shift;
+        my $selected    = shift;
+        my $select = "<select name='$select_name'>";
+
+        foreach my $value (@_) {
+                    my $check = $selected eq $value ? "selected='selected'" : '';
+                    $select .= "<option $check value='$value'>$value</option>";
+        }
+        $select .= "</select>";
+        return $select;
+}
+
+# Build a list of IP obtained from the %entries hash
+# param1: IP field name
+sub get_known_ips ($) {
+        my $field = shift;
+        my $qs = $cgiparams{'SEE_SORT'};       # switch the sort order
+        $cgiparams{'SEE_SORT'} = $field;
+
+        my @liste=('*.*.*.*');
+        foreach my $entry ( sort sort_entries keys %entries) {
+                    push (@liste, $entries{$entry}->{$field}) if (! grep (/^$entries{$entry}->{$field}$/,@liste) );
+        }
+
+        $cgiparams{'SEE_SORT'} = $qs;  #restore sort order
+        return @liste;
 }
+
+# Used to sort the table containing the lines displayed.
+sub sort_entries { #Reverse is not implemented
+        my $qs=$cgiparams{'SEE_SORT'};
+        if ($qs =~ /orgsip|orgdip|exsip|exdip/) {
+                my @a = split(/\./,$entries{$a}->{$qs});
+                my @b = split(/\./,$entries{$b}->{$qs});
+                ($a[0]<=>$b[0]) ||
+                ($a[1]<=>$b[1]) ||
+                ($a[2]<=>$b[2]) ||
+                ($a[3]<=>$b[3]);
+        } elsif ($qs =~ /expire|orgsp|orgdp|exsp|exdp/) {
+                    $entries{$a}->{$qs} <=> $entries{$b}->{$qs};
+        } else {
+                    $entries{$a}->{$qs} cmp $entries{$b}->{$qs};
+        }
+}
+
+1;