add conntrack zone serialization

this allows to use the zone for conntrack delete

Author: aojea

conntrack_linux.go

@@ -439,6 +439,11 @@ func (s *ConntrackFlow) toNlData() ([]*nl.RtAttr, error) {
 		}
 	}
 
+	if s.Zone != 0 {
+		ctZone := nl.NewRtAttr(nl.CTA_ZONE, nl.BEUint16Attr(s.Zone))
+		payload = append(payload, ctZone)
+	}
+
 	return payload, nil
 }
 

conntrack_test.go

@@ -1542,6 +1542,8 @@ func TestConntrackDeleteV4(t *testing.T) {
 		t.Fatalf("failed to create netlink handle: %s", err)
 	}
 
+	ctZone := uint16(123)
+
 	flow := ConntrackFlow{
 		FamilyType: FAMILY_V4,
 		Forward: IPTuple{
@@ -1563,6 +1565,7 @@ func TestConntrackDeleteV4(t *testing.T) {
 		ProtoInfo: &ProtoInfoTCP{
 			State: nl.TCP_CONNTRACK_ESTABLISHED,
 		},
+		Zone: ctZone,
 	}
 
 	// Create the entry using the handle
@@ -1587,6 +1590,7 @@ func TestConntrackDeleteV4(t *testing.T) {
 			ConntrackOrigDstPort: flow.Forward.DstPort,
 		},
 		protoFilter: unix.IPPROTO_TCP,
+		zoneFilter:  &ctZone,
 	}
 	var match *ConntrackFlow
 	for _, f := range flows {
@@ -1647,6 +1651,8 @@ func TestConntrackDeleteV6(t *testing.T) {
 		t.Fatalf("failed to create netlink handle: %s", err)
 	}
 
+	ctZone := uint16(123)
+
 	flow := ConntrackFlow{
 		FamilyType: FAMILY_V6,
 		Forward: IPTuple{
@@ -1668,6 +1674,7 @@ func TestConntrackDeleteV6(t *testing.T) {
 		ProtoInfo: &ProtoInfoTCP{
 			State: nl.TCP_CONNTRACK_ESTABLISHED,
 		},
+		Zone: ctZone,
 	}
 
 	// Create the entry using the handle
@@ -1692,6 +1699,7 @@ func TestConntrackDeleteV6(t *testing.T) {
 			ConntrackOrigDstPort: flow.Forward.DstPort,
 		},
 		protoFilter: unix.IPPROTO_TCP,
+		zoneFilter:  &ctZone,
 	}
 	var match *ConntrackFlow
 	for _, f := range flows {