speedway does now accept inet6 token about capirca HOT 4 CLOSED

I'm unable to reproduce this issue using capirca-r168, as specified in the 
report.  Can you please verify if this occurs on a fresh install of r168?

----

$ cat > policies/test.pol 
header {
 target:: speedway INPUT DROP inet6
}
term deny-all-in {
  comment:: "Clean up rule for INPUT chain"
  logging:: syslog
  action:: deny
}
^d

$ ./aclgen.py 
writing ./filters/test.ipt
1 filters rendered
watson@watson:~/capirca$ more filters/test.ipt 
*filter
# Speedway INPUT Policy
# $Id:$
# $Date:$
# inet6
:INPUT DROP
-N I_deny-all-in
-A I_deny-all-in -m comment --comment "Clean up rule for INPUT chain"
-A I_deny-all-in -p all -j LOG --log-prefix deny-all-in 
-A I_deny-all-in -p all -j DROP
-A INPUT -j I_deny-all-in

COMMIT

Sorry, my initial report is incomplete. It works if you just specify one header 
(e.g. an INPUT or OUTPUT target). But with more than one header it actually 
fails on r168. The error happens also for IPv4 only if you specify the inet 
token. Here's an example that fail:

$ cat policies/test.pol 
header {
 target:: speedway INPUT DROP inet6
}
term deny-all-in {
  comment:: "Clean up rule for INPUT chain"
  logging:: syslog
  action:: deny
}

header {
 target:: speedway OUTPUT DROP inet6
}
term deny-all-out {
  comment:: "Clean up rule for OUTPUT chain"
  logging:: syslog
  action:: deny
}
^D


In the example above, replace the inet6 token with inet and the issue still 
happens. Then remove the inet token and it works.

BTW, the issue's subject has a typo. Should read "speedway does not accept 
inet6 token". In any case the issue happens both with iptables and speedway 
when inet or inet6 tokens are specified.

This issue should be resolved in r187.
The problem was filter_type was not being reset to None before processing each 
filter
in a given policy.