OSSP CVS Repository

ossp - Check-in [4925]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 4925
Date: 2004-Dec-26 20:43:39 (local)
2004-Dec-26 19:43:39 (UTC)
User:rse
Branch:
Comment: Implement the wildcard port handling
Tickets:
Inspections:
Files:
ossp-pkg/flow2rrd/ChangeLog      1.5 -> 1.6     5 inserted, 0 deleted
ossp-pkg/flow2rrd/flow2rrd.pl      1.9 -> 1.10     3 inserted, 2 deleted

ossp-pkg/flow2rrd/ChangeLog 1.5 -> 1.6

--- ChangeLog    2004/12/26 18:53:19     1.5
+++ ChangeLog    2004/12/26 19:43:39     1.6
@@ -8,6 +8,11 @@
 
   ChangeLog
 
+  Changes between 0.9.1 and 0.9.2 (26-Dec-2004 to 27-Dec-2004):
+
+    *) Implement the wildcard port handling.
+       [Ralf S. Engelschall]
+
   Changes between 0.9.0 and 0.9.1 (26-Dec-2004 to 26-Dec-2004):
 
     *) Adjust default configuration path.


ossp-pkg/flow2rrd/flow2rrd.pl 1.9 -> 1.10

--- flow2rrd.pl  2004/12/26 18:52:45     1.9
+++ flow2rrd.pl  2004/12/26 19:43:39     1.10
@@ -383,8 +383,9 @@
                             my $proto = $cfg->{'Protocol'}->{$s->{-proto}};
                             my $port  = $s->{-port};
                             if ($Cflow::protocol == $proto) {
-                                if (   (    $inbound and $Cflow::dstport == $port)
-                                    or (not $inbound and $Cflow::srcport == $port)) {
+                                if (   $port eq '*'
+                                    or ((        $inbound and $port == $Cflow::dstport)
+                                         or (not $inbound and $port == $Cflow::srcport))) {
                                     $matched = 1;
                                 }
                             }

CVSTrac 2.0.1