interesting
/
nftables
mirror of https://github.com/google/nftables.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Compare commits

base: interesting:f57a5f47487cf388a3189b8ada9a514f3468d552
Branches Tags
interesting:main
interesting:v0.3.0
interesting:v0.2.0
interesting:v0.1.0
..
compare: interesting:427c65409bbe52f2a5f28ab2bec622f9805dd16d
Branches Tags
interesting:main
interesting:v0.3.0
interesting:v0.2.0
interesting:v0.1.0

1 Commits
f57a5f4748 ... 427c65409b

Author SHA1 Message Date
Paul Greenberg 427c65409b
Merge dae73eaa9c into 6d4c531bb6 2023-12-21 14:55:01 -07:00
2 changed files with 0 additions and 7 deletions
Show Stats Expand all files Collapse all files

2
expr/expr.go
View File

@ -287,8 +287,6 @@ const (
NF_NAT_RANGE_PROTO_RANDOM_FULLY = 0x10 NF_NAT_RANGE_PROTO_RANDOM_FULLY = 0x10
// NF_NAT_RANGE_PERSISTENT defines flag for a persistent masquerade // NF_NAT_RANGE_PERSISTENT defines flag for a persistent masquerade
NF_NAT_RANGE_PERSISTENT = 0x8 NF_NAT_RANGE_PERSISTENT = 0x8
// NF_NAT_RANGE_PREFIX defines flag for a prefix masquerade
NF_NAT_RANGE_PREFIX = 0x40
) )
func (e *Masq) marshal(fam byte) ([]byte, error) { func (e *Masq) marshal(fam byte) ([]byte, error) {

5
expr/nat.go
View File

@ -40,7 +40,6 @@ type NAT struct {
Random bool Random bool
FullyRandom bool FullyRandom bool
Persistent bool Persistent bool
Prefix bool
} }
// |00048|N-|00001| |len |flags| type| // |00048|N-|00001| |len |flags| type|
@ -83,9 +82,6 @@ func (e *NAT) marshal(fam byte) ([]byte, error) {
if e.Persistent { if e.Persistent {
flags |= NF_NAT_RANGE_PERSISTENT flags |= NF_NAT_RANGE_PERSISTENT
} }
if e.Prefix {
flags |= NF_NAT_RANGE_PREFIX
}
if flags != 0 { if flags != 0 {
attrs = append(attrs, netlink.Attribute{Type: unix.NFTA_NAT_FLAGS, Data: binaryutil.BigEndian.PutUint32(flags)}) attrs = append(attrs, netlink.Attribute{Type: unix.NFTA_NAT_FLAGS, Data: binaryutil.BigEndian.PutUint32(flags)})
} }
@ -125,7 +121,6 @@ func (e *NAT) unmarshal(fam byte, data []byte) error {
e.Persistent = (flags & NF_NAT_RANGE_PERSISTENT) != 0 e.Persistent = (flags & NF_NAT_RANGE_PERSISTENT) != 0
e.Random = (flags & NF_NAT_RANGE_PROTO_RANDOM) != 0 e.Random = (flags & NF_NAT_RANGE_PROTO_RANDOM) != 0
e.FullyRandom = (flags & NF_NAT_RANGE_PROTO_RANDOM_FULLY) != 0 e.FullyRandom = (flags & NF_NAT_RANGE_PROTO_RANDOM_FULLY) != 0
e.Prefix = (flags & NF_NAT_RANGE_PREFIX) != 0
} }
} }
return ad.Err() return ad.Err()