Packetfilter: add support for IPV6

pkg/packetfilter/iptables/iptables.go

@@ -75,9 +75,17 @@ type packetFilter struct {
 }
 
 func New() (packetfilter.Driver, error) {
-	ipt, err := iptables.New(iptables.IPFamily(iptables.ProtocolIPv4), iptables.Timeout(5))
+	return newiptables(iptables.ProtocolIPv4)
+}
+
+func NewV6() (packetfilter.Driver, error) {
+	return newiptables(iptables.ProtocolIPv6)
+}
+
+func newiptables(proto iptables.Protocol) (packetfilter.Driver, error) {
+	ipt, err := iptables.New(iptables.IPFamily(proto), iptables.Timeout(5))
 	if err != nil {
-		return nil, errors.Wrap(err, "error creating IP tables")
+		return nil, errors.Wrapf(err, "error creating IP tables for protocol %d", proto)
 	}
 
 	ipSetIface := ipset.New()

pkg/packetfilter/iptables/namedset.go

@@ -31,6 +31,9 @@ type namedSet struct {
 
 func (p *packetFilter) NewNamedSet(set *packetfilter.SetInfo) packetfilter.NamedSet {
 	hashFamily := ipset.ProtocolFamilyIPV4
+	if set.Family == packetfilter.SetFamilyV6 {
+		hashFamily = ipset.ProtocolFamilyIPV6
+	}
 
 	return &namedSet{
 		ipSetIface: p.ipSetIface,

pkg/packetfilter/packetfilter.go

@@ -253,8 +253,9 @@ type ChainIPHook struct {
 type SetFamily uint32
 
 const (
-	// curently only IPV4 sets are supported.
+	// IPV4 and IPV6 sets are supported.
 	SetFamilyV4 SetFamily = iota
+	SetFamilyV6
 )
 
 // named set.
@@ -307,22 +308,37 @@ type Interface interface {
 	UpdateChainRules(table TableType, chain string, rules []*Rule) error
 }
 
-var newDriverFn func() (Driver, error)
+var (
+	newDriverFn   func() (Driver, error)
+	newDriverFnV6 func() (Driver, error)
+)
 
 func SetNewDriverFn(f func() (Driver, error)) {
 	newDriverFn = f
 }
 
+func SetNewDriverFnV6(f func() (Driver, error)) {
+	newDriverFnV6 = f
+}
+
 type Adapter struct {
 	Driver
 }
 
 func New() (Interface, error) {
-	if newDriverFn == nil {
+	return newImpl(newDriverFn)
+}
+
+func NewV6() (Interface, error) {
+	return newImpl(newDriverFnV6)
+}
+
+func newImpl(f func() (Driver, error)) (Interface, error) {
+	if f == nil {
 		return nil, errors.New("no driver registered")
 	}
 
-	driver, err := newDriverFn()
+	driver, err := f()
 	if err != nil {
 		return nil, errors.Wrap(err, "error creating packet filter Driver")
 	}