Merge a0423c9897 into 0420ffbf57

expr/ct.go

@@ -186,6 +186,9 @@ func (e *Ct) unmarshal(fam byte, data []byte) error {
 			e.Register = ad.Uint32()
 		case unix.NFTA_CT_DIRECTION:
 			e.Direction = ad.Uint32()
+		case unix.NFTA_CT_SREG:
+			e.SourceRegister = true
+			e.Register = ad.Uint32()
 		}
 	}
 	return ad.Err()

expr/ct_test.go

@@ -38,6 +38,14 @@ func TestCt(t *testing.T) {
 				Direction: 1, // direction: reply
 			},
 		},
+		{
+			name: "Unmarshal Ct source register case",
+			ct: Ct{
+				Register:       1,
+				Key:            CtKeySRC,
+				SourceRegister: true,
+			},
+		},
 	}
 
 	for _, tt := range tests {

expr/expr.go

@@ -209,6 +209,8 @@ func exprFromName(name string) Any {
 		e = &CtTimeout{}
 	case "fib":
 		e = &Fib{}
+	case "numgen":
+		e = &Numgen{}
 	}
 	return e
 }