Move statistics counters from individual pf_test_<proto>() and pf_test_state_<proto>() to pf_test() and pf_test6(). Reduce code redundancy, and fix the following bugs:
Move statistics counters from individual pf_test_<proto>() and
pf_test_state_<proto>() to pf_test() and pf_test6(). Reduce
code redundancy, and fix the following bugs:

- ICMP packets were not being accounted for correctly (missing
  statistics code in pf_test_state_icmp()
- Some packets were not being counted in the loginterface statistics

NOTE: Under some situations with route-to, packets may get counted
once on the original interface, and once on the pf-routed interface.
This can be dealt with by rules which specify the each interface
explicitly.

ok cedric@, henning@

orumin/openbsd-efivars,orumin/openbsd-efivars,orumin/openbsd-efivars,orumin/openbsd-efivars