Merge dae73eaa9c into 3b928008ad

expr/ct.go

@@ -61,7 +61,6 @@ type Ct struct {
 	Register       uint32
 	SourceRegister bool
 	Key            CtKey
-	Direction      uint32
 }
 
 func (e *Ct) marshal(fam byte) ([]byte, error) {
@@ -103,20 +102,6 @@ func (e *Ct) marshalData(fam byte) ([]byte, error) {
 		return nil, err
 	}
 	exprData = append(exprData, regData...)
-
-	switch e.Key {
-	case CtKeySRC, CtKeyDST, CtKeyPROTOSRC, CtKeyPROTODST:
-		regData, err = netlink.MarshalAttributes(
-			[]netlink.Attribute{
-				{Type: unix.NFTA_CT_DIRECTION, Data: binaryutil.BigEndian.PutUint32(e.Direction)},
-			},
-		)
-		if err != nil {
-			return nil, err
-		}
-		exprData = append(exprData, regData...)
-	}
-
 	return exprData, nil
 }
 
@@ -132,8 +117,6 @@ func (e *Ct) unmarshal(fam byte, data []byte) error {
 			e.Key = CtKey(ad.Uint32())
 		case unix.NFTA_CT_DREG:
 			e.Register = ad.Uint32()
-		case unix.NFTA_CT_DIRECTION:
-			e.Direction = ad.Uint32()
 		}
 	}
 	return ad.Err()

expr/ct_test.go

@@ -1,69 +0,0 @@
-package expr
-
-import (
-	"encoding/binary"
-	"reflect"
-	"testing"
-
-	"github.com/mdlayher/netlink"
-	"golang.org/x/sys/unix"
-)
-
-func TestCt(t *testing.T) {
-	t.Parallel()
-	tests := []struct {
-		name string
-		ct   Ct
-	}{
-		{
-			name: "Unmarshal Ct status case",
-			ct: Ct{
-				Register: 1,
-				Key:      CtKeySTATUS,
-			},
-		},
-		{
-			name: "Unmarshal Ct proto-dst direction original case",
-			ct: Ct{
-				Register:  1,
-				Key:       CtKeyPROTODST,
-				Direction: 0, // direction: original
-			},
-		},
-		{
-			name: "Unmarshal Ct src direction reply case",
-			ct: Ct{
-				Register:  1,
-				Key:       CtKeySRC,
-				Direction: 1, // direction: reply
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			nct := Ct{}
-			data, err := tt.ct.marshal(0 /* don't care in this test */)
-			if err != nil {
-				t.Fatalf("marshal error: %+v", err)
-
-			}
-			ad, err := netlink.NewAttributeDecoder(data)
-			if err != nil {
-				t.Fatalf("NewAttributeDecoder() error: %+v", err)
-			}
-			ad.ByteOrder = binary.BigEndian
-			for ad.Next() {
-				if ad.Type() == unix.NFTA_EXPR_DATA {
-					if err := nct.unmarshal(0, ad.Bytes()); err != nil {
-						t.Errorf("unmarshal error: %+v", err)
-						break
-					}
-				}
-			}
-			if !reflect.DeepEqual(tt.ct, nct) {
-				t.Fatalf("original %+v and recovered %+v Ct structs are different", tt.ct, nct)
-			}
-		})
-	}
-}