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

Compare commits

base: interesting:a4241cd73c10b809ce0bb29d31447f6402bfa8e0
Branches Tags
interesting:main
interesting:v0.3.0
interesting:v0.2.0
interesting:v0.1.0
..
compare: interesting:19efdc42d3502e82746b2031ce2eff3c45fe4664
Branches Tags
interesting:main
interesting:v0.3.0
interesting:v0.2.0
interesting:v0.1.0

3 Commits
a4241cd73c ... 19efdc42d3

Author SHA1 Message Date
Paul Greenberg 19efdc42d3
Merge dae73eaa9c into 385f80f4ef 2025-02-27 20:36:02 +08:00
Jan Schär 385f80f4ef Use const instead of var where possible 2025-02-26 15:11:55 +01:00
Jan Schär 594585af33 Initialize registers in test 
Recent kernels disallow reads from uninitialized registers, which breaks
this test.

See 14fb07130c
 2025-02-26 15:11:55 +01:00
6 changed files with 20 additions and 9 deletions
Show Stats Expand all files Collapse all files

3
gen.go
View File

@ -3,6 +3,7 @@ package nftables
import (
"encoding/binary"
"fmt"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
@ -13,7 +14,7 @@ type GenMsg struct {
ProcComm string // [16]byte - max 16bytes - kernel TASK_COMM_LEN
}
var genHeaderType = netlink.HeaderType((unix.NFNL_SUBSYS_NFTABLES << 8) | unix.NFT_MSG_NEWGEN)
const genHeaderType = netlink.HeaderType((unix.NFNL_SUBSYS_NFTABLES << 8) | unix.NFT_MSG_NEWGEN)
func genFromMsg(msg netlink.Message) (*GenMsg, error) {
if got, want := msg.Header.Type, genHeaderType; got != want {

14
nftables_test.go
View File

@ -637,6 +637,14 @@ func TestMasqMarshalUnmarshal(t *testing.T) {
Table: filter,
Chain: postrouting,
Exprs: []expr.Any{
&expr.Immediate{
Register: min,
Data: binaryutil.BigEndian.PutUint16(4070),
},
&expr.Immediate{
Register: max,
Data: binaryutil.BigEndian.PutUint16(4090),
},
&expr.Masq{
ToPorts: true,
RegProtoMin: min,
@ -667,13 +675,13 @@ func TestMasqMarshalUnmarshal(t *testing.T) {
}
rule := rules[0]
if got, want := len(rule.Exprs), 1; got != want {
if got, want := len(rule.Exprs), 3; got != want {
t.Fatalf("unexpected number of exprs: got %d, want %d", got, want)
}
me, ok := rule.Exprs[0].(*expr.Masq)
me, ok := rule.Exprs[2].(*expr.Masq)
if !ok {
t.Fatalf("unexpected expression type: got %T, want *expr.Masq", rule.Exprs[0])
t.Fatalf("unexpected expression type: got %T, want *expr.Masq", rule.Exprs[2])
}
if got, want := me.ToPorts, true; got != want {

2
obj.go
View File

@ -25,7 +25,7 @@ import (
"golang.org/x/sys/unix"
)
var (
const (
newObjHeaderType = netlink.HeaderType((unix.NFNL_SUBSYS_NFTABLES << 8) | unix.NFT_MSG_NEWOBJ)
delObjHeaderType = netlink.HeaderType((unix.NFNL_SUBSYS_NFTABLES << 8) | unix.NFT_MSG_DELOBJ)
)

2
rule.go
View File

@ -25,7 +25,7 @@ import (
"golang.org/x/sys/unix"
)
var (
const (
newRuleHeaderType = netlink.HeaderType((unix.NFNL_SUBSYS_NFTABLES << 8) | unix.NFT_MSG_NEWRULE)
delRuleHeaderType = netlink.HeaderType((unix.NFNL_SUBSYS_NFTABLES << 8) | unix.NFT_MSG_DELRULE)
)

6
set.go
View File

@ -166,7 +166,9 @@ var (
TypeTimeDay,
TypeCGroupV2,
}
)
const (
// ctLabelBitSize is defined in https://git.netfilter.org/nftables/tree/src/ct.c.
ctLabelBitSize uint32 = 128
@ -737,7 +739,7 @@ func (cc *Conn) FlushSet(s *Set) {
})
}
var (
const (
newSetHeaderType = netlink.HeaderType((unix.NFNL_SUBSYS_NFTABLES << 8) | unix.NFT_MSG_NEWSET)
delSetHeaderType = netlink.HeaderType((unix.NFNL_SUBSYS_NFTABLES << 8) | unix.NFT_MSG_DELSET)
)
@ -837,7 +839,7 @@ func parseSetDatatype(magic uint32) (SetDatatype, error) {
return dt, nil
}
var (
const (
newElemHeaderType = netlink.HeaderType((unix.NFNL_SUBSYS_NFTABLES << 8) | unix.NFT_MSG_NEWSETELEM)
delElemHeaderType = netlink.HeaderType((unix.NFNL_SUBSYS_NFTABLES << 8) | unix.NFT_MSG_DELSETELEM)
)

2
table.go
View File

@ -21,7 +21,7 @@ import (
"golang.org/x/sys/unix"
)
var (
const (
newTableHeaderType = netlink.HeaderType((unix.NFNL_SUBSYS_NFTABLES << 8) | unix.NFT_MSG_NEWTABLE)
delTableHeaderType = netlink.HeaderType((unix.NFNL_SUBSYS_NFTABLES << 8) | unix.NFT_MSG_DELTABLE)
)