pflowproto 9 is no more.

While there fix regression for inaddr_any flowsrc.

5 files changed, 14 insertions, 147 deletions

diff --git a/regress/sys/net/pflow/Makefile b/regress/sys/net/pflow/Makefile
index 8f0e72e029c..ee067f9b838 100644
--- a/regress/sys/net/pflow/Makefile
+++ b/regress/sys/net/pflow/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.3 2013/09/13 14:51:50 florian Exp $
+# $OpenBSD: Makefile,v 1.4 2014/03/29 11:49:41 florian Exp $
 #
-#  template_v{9,10}
+#  template_v10
 #  ----------------
 #  * create pflow0 sending from 127.0.0.1 to 127.0.0.1:9996
 #  * wait for first template and compare it to known good template
 #  * destroy pflow0
 #
-#  flow_{9,10}_{4,6}
+#  flow_10_{4,6}
 #  -----------------
 #  * create pflow0 sending from 127.0.0.1 to 127.0.0.1:9996
 #  * add 10.11.12.13 and 2001:db8::13 to lo0
@@ -26,25 +26,15 @@
 # Take up pflow0 and test various combinations of flowdst, flowsrc and proto.
 # Destroy it in the end.
 
-REGRESS_TARGETS=template_v9 template_v10 flow_9_4 flow_9_6 flow_10_4 flow_10_6
-REGRESS_TARGETS+=ifconfig
+REGRESS_TARGETS=template_v10 flow_10_4 flow_10_6 ifconfig
 
 PROG=   gen_traffic
 LDADD=  -levent
 
-template_v9:
-	perl -I ${.CURDIR} ${.CURDIR}/template.pl 9 \
-	    | cmp -s ${.CURDIR}/template.v9 /dev/stdin
 template_v10:
 	perl -I ${.CURDIR} ${.CURDIR}/template.pl 10 \
 	    | cmp -s ${.CURDIR}/template.v10 /dev/stdin
 
-flow_9_4: gen_traffic
-	perl -I ${.CURDIR} ${.CURDIR}/flow.pl 9 4 \
-	    | cmp -s ${.CURDIR}/flow.9_4 /dev/stdin
-flow_9_6: gen_traffic
-	perl -I ${.CURDIR} ${.CURDIR}/flow.pl 9 6 \
-	    | cmp -s ${.CURDIR}/flow.9_6 /dev/stdin
 flow_10_4: gen_traffic
 	perl -I ${.CURDIR} ${.CURDIR}/flow.pl 10 4 \
 	    | cmp -s ${.CURDIR}/flow.10_4 /dev/stdin
diff --git a/regress/sys/net/pflow/flow.9_4 b/regress/sys/net/pflow/flow.9_4
deleted file mode 100644
index 43c11865228..00000000000
--- a/regress/sys/net/pflow/flow.9_4
+++ /dev/null
@@ -1,49 +0,0 @@
-4 flows
-12 elements
-SetId: 256
-sourceIPv4Address: 0a0b0c0d
-destinationIPv4Address: 0a0b0c0d
-packetDeltaCount: 000000000000000e
-octetDeltaCount: 000000000000a2e4
-sourceTransportPort: 3039
-destinationTransportPort: 303a
-ipClassOfService: 00
-protocolIdentifier: 06
-duration >= 9 && duration <= 12: 1
-ingressInterface == egressInterface && egressInterface > 0: 1
-12 elements
-SetId: 256
-sourceIPv4Address: 0a0b0c0d
-destinationIPv4Address: 0a0b0c0d
-packetDeltaCount: 000000000000000d
-octetDeltaCount: 00000000000002b0
-sourceTransportPort: 303a
-destinationTransportPort: 3039
-ipClassOfService: 00
-protocolIdentifier: 06
-duration >= 9 && duration <= 12: 1
-ingressInterface == egressInterface && egressInterface > 0: 1
-12 elements
-SetId: 256
-sourceIPv4Address: 0a0b0c0d
-destinationIPv4Address: 0a0b0c0d
-packetDeltaCount: 000000000000000e
-octetDeltaCount: 000000000000a2e4
-sourceTransportPort: 3039
-destinationTransportPort: 303a
-ipClassOfService: 00
-protocolIdentifier: 06
-duration >= 9 && duration <= 12: 1
-ingressInterface == egressInterface && egressInterface > 0: 1
-12 elements
-SetId: 256
-sourceIPv4Address: 0a0b0c0d
-destinationIPv4Address: 0a0b0c0d
-packetDeltaCount: 000000000000000d
-octetDeltaCount: 00000000000002b0
-sourceTransportPort: 303a
-destinationTransportPort: 3039
-ipClassOfService: 00
-protocolIdentifier: 06
-duration >= 9 && duration <= 12: 1
-ingressInterface == egressInterface && egressInterface > 0: 1
diff --git a/regress/sys/net/pflow/flow.9_6 b/regress/sys/net/pflow/flow.9_6
deleted file mode 100644
index 389043642be..00000000000
--- a/regress/sys/net/pflow/flow.9_6
+++ /dev/null
@@ -1,49 +0,0 @@
-4 flows
-12 elements
-SetId: 257
-sourceIPv6Address: 20010db8000000000000000000000013
-destinationIPv6Address: 20010db8000000000000000000000013
-packetDeltaCount: 000000000000000e
-octetDeltaCount: 000000000000a3fc
-sourceTransportPort: 3039
-destinationTransportPort: 303a
-ipClassOfService: 00
-protocolIdentifier: 06
-duration >= 9 && duration <= 12: 1
-ingressInterface == egressInterface && egressInterface > 0: 1
-12 elements
-SetId: 257
-sourceIPv6Address: 20010db8000000000000000000000013
-destinationIPv6Address: 20010db8000000000000000000000013
-packetDeltaCount: 000000000000000d
-octetDeltaCount: 00000000000003b4
-sourceTransportPort: 303a
-destinationTransportPort: 3039
-ipClassOfService: 00
-protocolIdentifier: 06
-duration >= 9 && duration <= 12: 1
-ingressInterface == egressInterface && egressInterface > 0: 1
-12 elements
-SetId: 257
-sourceIPv6Address: 20010db8000000000000000000000013
-destinationIPv6Address: 20010db8000000000000000000000013
-packetDeltaCount: 000000000000000e
-octetDeltaCount: 000000000000a3fc
-sourceTransportPort: 3039
-destinationTransportPort: 303a
-ipClassOfService: 00
-protocolIdentifier: 06
-duration >= 9 && duration <= 12: 1
-ingressInterface == egressInterface && egressInterface > 0: 1
-12 elements
-SetId: 257
-sourceIPv6Address: 20010db8000000000000000000000013
-destinationIPv6Address: 20010db8000000000000000000000013
-packetDeltaCount: 000000000000000d
-octetDeltaCount: 00000000000003b4
-sourceTransportPort: 303a
-destinationTransportPort: 3039
-ipClassOfService: 00
-protocolIdentifier: 06
-duration >= 9 && duration <= 12: 1
-ingressInterface == egressInterface && egressInterface > 0: 1
diff --git a/regress/sys/net/pflow/ifconfig.ok b/regress/sys/net/pflow/ifconfig.ok
index f98376a58a0..8b3c4b119b5 100644
--- a/regress/sys/net/pflow/ifconfig.ok
+++ b/regress/sys/net/pflow/ifconfig.ok
@@ -1,23 +1,23 @@
 #### up
 pflow0: flags=1<UP> mtu 1492
 	priority: 0
-	pflow: sender: INVALID receiver: INVALID:INVALID version: 5
+	pflow: receiver: INVALID:INVALID version: 5
 	groups: pflow
 #### flowdst syntax error
 ifconfig: 127.0.0.1 bad value
 pflow0: flags=1<UP> mtu 1492
 	priority: 0
-	pflow: sender: INVALID receiver: INVALID:INVALID version: 5
+	pflow: receiver: INVALID:INVALID version: 5
 	groups: pflow
 #### invalid flowdst port
 pflow0: flags=1<UP> mtu 1492
 	priority: 0
-	pflow: sender: INVALID receiver: 127.0.0.1:INVALID version: 5
+	pflow: receiver: 127.0.0.1:INVALID version: 5
 	groups: pflow
 #### flowdst set, invalid flowsrc
-pflow0: flags=1<UP> mtu 1492
+pflow0: flags=41<UP,RUNNING> mtu 1492
 	priority: 0
-	pflow: sender: INVALID receiver: 127.0.0.1:9996 version: 5
+	pflow: receiver: 127.0.0.1:9996 version: 5
 	groups: pflow
 #### flowsrc and flowdst set
 pflow0: flags=41<UP,RUNNING> mtu 1492
@@ -32,7 +32,7 @@ pflow0: flags=1<UP> mtu 1492
 #### unset flowsrc
 pflow0: flags=1<UP> mtu 1492
 	priority: 0
-	pflow: sender: INVALID receiver: INVALID:INVALID version: 5
+	pflow: receiver: INVALID:INVALID version: 5
 	groups: pflow
 #### flowsrc and flowdst set one command
 pflow0: flags=41<UP,RUNNING> mtu 1492
@@ -40,9 +40,10 @@ pflow0: flags=41<UP,RUNNING> mtu 1492
 	pflow: sender: 127.0.0.1 receiver: 127.0.0.1:9996 version: 5
 	groups: pflow
 #### proto 9
-pflow0: flags=41<UP,RUNNING> mtu 1428
+ifconfig: Invalid pflow protocol: 9
+pflow0: flags=41<UP,RUNNING> mtu 1492
 	priority: 0
-	pflow: sender: 127.0.0.1 receiver: 127.0.0.1:9996 version: 9
+	pflow: sender: 127.0.0.1 receiver: 127.0.0.1:9996 version: 5
 	groups: pflow
 #### proto 10
 pflow0: flags=41<UP,RUNNING> mtu 1448
@@ -73,7 +74,7 @@ pflow0: flags=1<UP> mtu 1492
 #### flowsrc 0.0.0.0; INVALID
 pflow0: flags=1<UP> mtu 1492
 	priority: 0
-	pflow: sender: INVALID receiver: INVALID:1234 version: 5
+	pflow: receiver: INVALID:1234 version: 5
 	groups: pflow
 #### destroy
 pflow0: no such interface
diff --git a/regress/sys/net/pflow/template.v9 b/regress/sys/net/pflow/template.v9
deleted file mode 100644
index c5f96c457c2..00000000000
--- a/regress/sys/net/pflow/template.v9
+++ /dev/null
@@ -1,26 +0,0 @@
-Template Id: 256
-sourceIPv4Address(4)
-destinationIPv4Address(4)
-ingressInterface(4)
-egressInterface(4)
-packetDeltaCount(8)
-octetDeltaCount(8)
-flowStartSysUpTime(4)
-flowEndSysUpTime(4)
-sourceTransportPort(2)
-destinationTransportPort(2)
-ipClassOfService(1)
-protocolIdentifier(1)
-Template Id: 257
-sourceIPv6Address(16)
-destinationIPv6Address(16)
-ingressInterface(4)
-egressInterface(4)
-packetDeltaCount(8)
-octetDeltaCount(8)
-flowStartSysUpTime(4)
-flowEndSysUpTime(4)
-sourceTransportPort(2)
-destinationTransportPort(2)
-ipClassOfService(1)
-protocolIdentifier(1)