Index: ossp-pkg/flow2rrd/ChangeLog
RCS File: /v/ossp/cvs/ossp-pkg/flow2rrd/ChangeLog,v
rcsdiff -q -kk '-r1.7' '-r1.8' -u '/v/ossp/cvs/ossp-pkg/flow2rrd/ChangeLog,v' 2>/dev/null
--- ChangeLog	2004/12/26 20:03:35	1.7
+++ ChangeLog	2004/12/27 13:06:19	1.8
@@ -10,6 +10,11 @@
 
   Changes between 0.9.1 and 0.9.2 (26-Dec-2004 to 27-Dec-2004):
 
+    *) Match flows against targets in the same order the targets
+       occur in the configuration file to allow overlapping
+       networks (where the first matching one is taken).
+       [Ralf S. Engelschall, Christoph Schug]
+
     *) Small source tree cleanups.
        [Ralf S. Engelschall]
 
Index: ossp-pkg/flow2rrd/THANKS
RCS File: /v/ossp/cvs/ossp-pkg/flow2rrd/THANKS,v
rcsdiff -q -kk '-r1.3' '-r1.4' -u '/v/ossp/cvs/ossp-pkg/flow2rrd/THANKS,v' 2>/dev/null
--- THANKS	2004/12/26 20:03:35	1.3
+++ THANKS	2004/12/27 13:06:19	1.4
@@ -11,6 +11,7 @@
   Credit has to be given to the following people who contributed ideas,
   stuff, bugfixes, hints etc. (in alphabetical order):
 
+  o Christoph Schug          <chris@schug.net>
   o Thomas Lotterer          <thomas@lotterer.net>
 
   ...and all other OSSP flow2rrd users who gave me feedback but I've forgot.
Index: ossp-pkg/flow2rrd/flow2rrd.pl
RCS File: /v/ossp/cvs/ossp-pkg/flow2rrd/flow2rrd.pl,v
rcsdiff -q -kk '-r1.11' '-r1.12' -u '/v/ossp/cvs/ossp-pkg/flow2rrd/flow2rrd.pl,v' 2>/dev/null
--- flow2rrd.pl	2004/12/26 20:03:35	1.11
+++ flow2rrd.pl	2004/12/27 13:06:19	1.12
@@ -370,7 +370,7 @@
         #   the flow matches them...
         my $matched_total = 0;
         LOOP: foreach my $host (@{$cfg->{'Host'}}) {
-            foreach my $target (grep { $_ !~ m/^-/ } keys(%{$host->{-target}})) {
+            foreach my $target (@{$host->{-target}->{-order}}) {
                 my $matched = 0;
                 my $inbound; $inbound = undef;
                 my $np = $ctx->{-network}->{$host->{-name}.":".$target};