From 385f80f4ef5b5aa1e6d369d1574d754497f13a7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Sch=C3=A4r?= Date: Wed, 26 Feb 2025 12:27:31 +0100 Subject: [PATCH] Use const instead of var where possible --- gen.go | 3 ++- obj.go | 2 +- rule.go | 2 +- set.go | 6 ++++-- table.go | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gen.go b/gen.go index 4ebcfbe..0d4580d 100644 --- a/gen.go +++ b/gen.go @@ -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 { diff --git a/obj.go b/obj.go index 3fcd6d7..634931b 100644 --- a/obj.go +++ b/obj.go @@ -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) ) diff --git a/rule.go b/rule.go index 0706834..ad708d0 100644 --- a/rule.go +++ b/rule.go @@ -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) ) diff --git a/set.go b/set.go index a7441d9..446132f 100644 --- a/set.go +++ b/set.go @@ -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) ) diff --git a/table.go b/table.go index c391b7b..79e486b 100644 --- a/table.go +++ b/table.go @@ -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) )