head	1.1;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.1
	OPENPKG_E1_MP:1.1
	OPENPKG_E1_MP_2_STABLE:1.1.2.2
	OPENPKG_E1_FP:1.1.2.2
	OPENPKG_2_STABLE_MP:1.1
	OPENPKG_2_STABLE_20061018:1.1.2.2
	OPENPKG_2_STABLE:1.1.0.2
	OPENPKG_CW_FP:1.1;
locks; strict;
comment	@# @;


1.1
date	2004.12.27.12.58.52;	author rse;	state Exp;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2004.12.27.12.58.52;	author rse;	state dead;
branches;
next	1.1.2.2;
commitid	iZxwRSmmWscPXUQr;

1.1.2.2
date	2006.10.16.14.50.01;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.1
log
@apply patch for order-persistent matching of flows
@
text
@cvs diff: Diffing .
Index: flow2rrd.pl
===================================================================
RCS file: /u/rse/arc/cvs/ossp/ossp-pkg/flow2rrd/flow2rrd.pl,v
retrieving revision 1.11
diff -u -d -u -d -r1.11 flow2rrd.pl
--- flow2rrd.pl	26 Dec 2004 20:03:35 -0000	1.11
+++ flow2rrd.pl	27 Dec 2004 12:57:33 -0000
@@@@ -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};
@


1.1.2.1
log
@file flow2rrd.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:50:01 +0000
@
text
@d1 17
@


1.1.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 17
cvs diff: Diffing .
Index: flow2rrd.pl
===================================================================
RCS file: /u/rse/arc/cvs/ossp/ossp-pkg/flow2rrd/flow2rrd.pl,v
retrieving revision 1.11
diff -u -d -u -d -r1.11 flow2rrd.pl
--- flow2rrd.pl	26 Dec 2004 20:03:35 -0000	1.11
+++ flow2rrd.pl	27 Dec 2004 12:57:33 -0000
@@@@ -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};
@