diff options
| author | Florian Obser <florian@cvs.openbsd.org> | 2017-01-14 17:31:25 +0000 |
|---|---|---|
| committer | Florian Obser <florian@cvs.openbsd.org> | 2017-01-14 17:31:25 +0000 |
| commit | fda05cd4a2dcc0c072dd28376b9005e2dce81de9 (patch) | |
| tree | 8d72a9767bdb0f17c95e66c7c452ba7b261820b7 /regress | |
| parent | de98e879f79d6c6b1ac9dd096f22efb262907980 (diff) | |
Remove priority line, ifconfig(8) prints the interface index on the
same line and that changes on every interface creation, messing up the
diff to ifconfig.ok
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/sys/net/pflow/ifconfig.ok | 15 | ||||
| -rw-r--r-- | regress/sys/net/pflow/ifconfig.sh | 36 |
2 files changed, 20 insertions, 31 deletions
diff --git a/regress/sys/net/pflow/ifconfig.ok b/regress/sys/net/pflow/ifconfig.ok index 8b3c4b119b5..2d39a201e21 100644 --- a/regress/sys/net/pflow/ifconfig.ok +++ b/regress/sys/net/pflow/ifconfig.ok @@ -1,79 +1,64 @@ #### up pflow0: flags=1<UP> mtu 1492 - priority: 0 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: receiver: INVALID:INVALID version: 5 groups: pflow #### invalid flowdst port pflow0: flags=1<UP> mtu 1492 - priority: 0 pflow: receiver: 127.0.0.1:INVALID version: 5 groups: pflow #### flowdst set, invalid flowsrc pflow0: flags=41<UP,RUNNING> mtu 1492 - priority: 0 pflow: receiver: 127.0.0.1:9996 version: 5 groups: pflow #### flowsrc and flowdst set pflow0: flags=41<UP,RUNNING> mtu 1492 - priority: 0 pflow: sender: 127.0.0.1 receiver: 127.0.0.1:9996 version: 5 groups: pflow #### unset flowdst pflow0: flags=1<UP> mtu 1492 - priority: 0 pflow: sender: 127.0.0.1 receiver: INVALID:INVALID version: 5 groups: pflow #### unset flowsrc pflow0: flags=1<UP> mtu 1492 - priority: 0 pflow: receiver: INVALID:INVALID version: 5 groups: pflow #### flowsrc and flowdst set one command pflow0: flags=41<UP,RUNNING> mtu 1492 - priority: 0 pflow: sender: 127.0.0.1 receiver: 127.0.0.1:9996 version: 5 groups: pflow #### proto 9 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: 5 groups: pflow #### proto 10 pflow0: flags=41<UP,RUNNING> mtu 1448 - priority: 0 pflow: sender: 127.0.0.1 receiver: 127.0.0.1:9996 version: 10 groups: pflow #### proto 5 pflow0: flags=41<UP,RUNNING> mtu 1492 - priority: 0 pflow: sender: 127.0.0.1 receiver: 127.0.0.1:9996 version: 5 groups: pflow #### syntax error proto ifconfig: Invalid pflow protocol: 23 pflow0: flags=41<UP,RUNNING> mtu 1492 - priority: 0 pflow: sender: 127.0.0.1 receiver: 127.0.0.1:9996 version: 5 groups: pflow #### flowdst 0.0.0.0:0; INVALID:INVALID pflow0: flags=1<UP> mtu 1492 - priority: 0 pflow: sender: 127.0.0.1 receiver: INVALID:INVALID version: 5 groups: pflow #### flowdst 0.0.0.0:1234; INVALID:1234 pflow0: flags=1<UP> mtu 1492 - priority: 0 pflow: sender: 127.0.0.1 receiver: INVALID:1234 version: 5 groups: pflow #### flowsrc 0.0.0.0; INVALID pflow0: flags=1<UP> mtu 1492 - priority: 0 pflow: receiver: INVALID:1234 version: 5 groups: pflow #### destroy diff --git a/regress/sys/net/pflow/ifconfig.sh b/regress/sys/net/pflow/ifconfig.sh index 086f4155f33..b844e66a381 100644 --- a/regress/sys/net/pflow/ifconfig.sh +++ b/regress/sys/net/pflow/ifconfig.sh @@ -1,34 +1,38 @@ #! /bin/sh echo '#### up' -ifconfig pflow0 up; ifconfig pflow0 +ifconfig pflow0 up; ifconfig pflow0 | grep -v '^[[:space:]]index' echo '#### flowdst syntax error' -ifconfig pflow0 flowdst 127.0.0.1; ifconfig pflow0 +ifconfig pflow0 flowdst 127.0.0.1; ifconfig pflow0 | grep -v '^[[:space:]]index' echo '#### invalid flowdst port' -ifconfig pflow0 flowdst 127.0.0.1:0; ifconfig pflow0 +ifconfig pflow0 flowdst 127.0.0.1:0; ifconfig pflow0 | grep -v \ + '^[[:space:]]index' echo '#### flowdst set, invalid flowsrc' -ifconfig pflow0 flowdst 127.0.0.1:9996; ifconfig pflow0 +ifconfig pflow0 flowdst 127.0.0.1:9996; ifconfig pflow0 | grep -v \ + '^[[:space:]]index' echo '#### flowsrc and flowdst set' -ifconfig pflow0 flowsrc 127.0.0.1; ifconfig pflow0 +ifconfig pflow0 flowsrc 127.0.0.1; ifconfig pflow0 | grep -v '^[[:space:]]index' echo '#### unset flowdst' -ifconfig pflow0 -flowdst; ifconfig pflow0 +ifconfig pflow0 -flowdst; ifconfig pflow0 | grep -v '^[[:space:]]index' echo '#### unset flowsrc' -ifconfig pflow0 -flowsrc; ifconfig pflow0 +ifconfig pflow0 -flowsrc; ifconfig pflow0 | grep -v '^[[:space:]]index' echo '#### flowsrc and flowdst set one command' -ifconfig pflow0 flowsrc 127.0.0.1 flowdst 127.0.0.1:9996; ifconfig pflow0 +ifconfig pflow0 flowsrc 127.0.0.1 flowdst 127.0.0.1:9996; ifconfig pflow0 | \ + grep -v '^[[:space:]]index' echo '#### proto 9' -ifconfig pflow0 pflowproto 9; ifconfig pflow0 +ifconfig pflow0 pflowproto 9; ifconfig pflow0 | grep -v '^[[:space:]]index' echo '#### proto 10' -ifconfig pflow0 pflowproto 10; ifconfig pflow0 +ifconfig pflow0 pflowproto 10; ifconfig pflow0 | grep -v '^[[:space:]]index' echo '#### proto 5' -ifconfig pflow0 pflowproto 5; ifconfig pflow0 +ifconfig pflow0 pflowproto 5; ifconfig pflow0 | grep -v '^[[:space:]]index' echo '#### syntax error proto' -ifconfig pflow0 pflowproto 23; ifconfig pflow0 +ifconfig pflow0 pflowproto 23; ifconfig pflow0 | grep -v '^[[:space:]]index' echo '#### flowdst 0.0.0.0:0; INVALID:INVALID' -ifconfig pflow0 flowdst 0.0.0.0:0; ifconfig pflow0 +ifconfig pflow0 flowdst 0.0.0.0:0; ifconfig pflow0 | grep -v '^[[:space:]]index' echo '#### flowdst 0.0.0.0:1234; INVALID:1234' -ifconfig pflow0 flowdst 0.0.0.0:1234; ifconfig pflow0 +ifconfig pflow0 flowdst 0.0.0.0:1234; ifconfig pflow0 | grep -v \ + '^[[:space:]]index' echo '#### flowsrc 0.0.0.0; INVALID' -ifconfig pflow0 flowsrc 0.0.0.0; ifconfig pflow0 +ifconfig pflow0 flowsrc 0.0.0.0; ifconfig pflow0 | grep -v '^[[:space:]]index' echo '#### destroy' -ifconfig pflow0 destroy; ifconfig pflow0 +ifconfig pflow0 destroy; ifconfig pflow0 | grep -v '^[[:space:]]index' |