Skip to content

*: remove pkgHandle, remove HandleOptions.NetNS, add NewHandleAtWithOptions #1197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ti-mo wants to merge 2 commits into
base: main
Choose a base branch
from
Open

*: remove pkgHandle, remove HandleOptions.NetNS, add NewHandleAtWithOptions #1197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5288bc3
handle: remove HandleOptions.NetNS in favor of NewHandleAtWithOptions
ti-mo Jul 1, 2026
b9e1b86
*: remove pkgHandle
ti-mo Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions addr_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const (
// will be automatically computed based on the IP mask if /30 or larger.
// If `net.IPv4zero` is given as the broadcast address, broadcast is disabled.
func AddrAdd(link Link, addr *Addr) error {
return pkgHandle.AddrAdd(link, addr)
return pkgHandle().AddrAdd(link, addr)
}

// AddrAdd will add an IP address to a link device.
Expand All @@ -54,7 +54,7 @@ func (h *Handle) AddrAdd(link Link, addr *Addr) error {
// will be automatically computed based on the IP mask if /30 or larger.
// If `net.IPv4zero` is given as the broadcast address, broadcast is disabled.
func AddrReplace(link Link, addr *Addr) error {
return pkgHandle.AddrReplace(link, addr)
return pkgHandle().AddrReplace(link, addr)
}

// AddrReplace will replace (or, if not present, add) an IP address on a link device.
Expand All @@ -73,7 +73,7 @@ func (h *Handle) AddrReplace(link Link, addr *Addr) error {
//
// Equivalent to: `ip addr del $addr dev $link`
func AddrDel(link Link, addr *Addr) error {
return pkgHandle.AddrDel(link, addr)
return pkgHandle().AddrDel(link, addr)
}

// AddrDel will delete an IP address from a link device.
Expand Down Expand Up @@ -191,7 +191,7 @@ func (h *Handle) addrHandle(link Link, addr *Addr, req *nl.NetlinkRequest) error
// If the returned error is [ErrDumpInterrupted], results may be inconsistent
// or incomplete.
func AddrList(link Link, family int) ([]Addr, error) {
return pkgHandle.AddrList(link, family)
return pkgHandle().AddrList(link, family)
}

// AddrList gets a list of IP addresses in the system.
Expand Down Expand Up @@ -384,7 +384,7 @@ func addrSubscribeAt(newNs, curNs netns.NsHandle, ch chan<- AddrUpdate, done <-c
}()
}
if listExisting {
req := pkgHandle.newNetlinkRequest(unix.RTM_GETADDR,
req := pkgHandle().newNetlinkRequest(unix.RTM_GETADDR,
unix.NLM_F_DUMP)
infmsg := nl.NewIfInfomsg(unix.AF_UNSPEC)
req.AddData(infmsg)
Expand Down
32 changes: 16 additions & 16 deletions bridge_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
// If the returned error is [ErrDumpInterrupted], results may be inconsistent
// or incomplete.
func BridgeVlanTunnelShow() ([]nl.TunnelInfo, error) {
return pkgHandle.BridgeVlanTunnelShow()
return pkgHandle().BridgeVlanTunnelShow()
}

func (h *Handle) BridgeVlanTunnelShow() ([]nl.TunnelInfo, error) {
Expand All @@ -29,7 +29,7 @@ func (h *Handle) BridgeVlanTunnelShow() ([]nl.TunnelInfo, error) {
// If the returned error is [ErrDumpInterrupted], results may be inconsistent
// or incomplete.
func BridgeVlanTunnelShowDev(link Link) ([]nl.TunnelInfo, error) {
return pkgHandle.BridgeVlanTunnelShowDev(link)
return pkgHandle().BridgeVlanTunnelShowDev(link)
}

func (h *Handle) BridgeVlanTunnelShowDev(link Link) ([]nl.TunnelInfo, error) {
Expand Down Expand Up @@ -137,7 +137,7 @@ func parseTunnelInfo(nestAttr *syscall.NetlinkRouteAttr, results []nl.TunnelInfo
// If the returned error is [ErrDumpInterrupted], results may be inconsistent
// or incomplete.
func BridgeVlanList() (map[int32][]*nl.BridgeVlanInfo, error) {
return pkgHandle.BridgeVlanList()
return pkgHandle().BridgeVlanList()
}

// BridgeVlanList gets a map of device id to bridge vlan infos.
Expand Down Expand Up @@ -187,13 +187,13 @@ func (h *Handle) BridgeVlanList() (map[int32][]*nl.BridgeVlanInfo, error) {
// BridgeVlanAddTunnelInfo adds a new vlan filter entry
// Equivalent to: `bridge vlan add dev DEV vid VID tunnel_info id TUNID [ self ] [ master ]`
func BridgeVlanAddTunnelInfo(link Link, vid uint16, tunid uint32, self, master bool) error {
return pkgHandle.BridgeVlanAddTunnelInfo(link, vid, 0, tunid, 0, self, master)
return pkgHandle().BridgeVlanAddTunnelInfo(link, vid, 0, tunid, 0, self, master)
}

// BridgeVlanAddRangeTunnelInfoRange adds a new vlan filter entry
// Equivalent to: `bridge vlan add dev DEV vid VID-VIDEND tunnel_info id VIN-VINEND [ self ] [ master ]`
func BridgeVlanAddRangeTunnelInfoRange(link Link, vid, vidEnd uint16, tunid, tunidEnd uint32, self, master bool) error {
return pkgHandle.BridgeVlanAddTunnelInfo(link, vid, vidEnd, tunid, tunidEnd, self, master)
return pkgHandle().BridgeVlanAddTunnelInfo(link, vid, vidEnd, tunid, tunidEnd, self, master)
}

func (h *Handle) BridgeVlanAddTunnelInfo(link Link, vid, vidEnd uint16, tunid, tunidEnd uint32, self, master bool) error {
Expand All @@ -203,13 +203,13 @@ func (h *Handle) BridgeVlanAddTunnelInfo(link Link, vid, vidEnd uint16, tunid, t
// BridgeVlanDelTunnelInfo adds a new vlan filter entry
// Equivalent to: `bridge vlan del dev DEV vid VID tunnel_info id TUNID [ self ] [ master ]`
func BridgeVlanDelTunnelInfo(link Link, vid uint16, tunid uint32, self, master bool) error {
return pkgHandle.BridgeVlanDelTunnelInfo(link, vid, 0, tunid, 0, self, master)
return pkgHandle().BridgeVlanDelTunnelInfo(link, vid, 0, tunid, 0, self, master)
}

// BridgeVlanDelRangeTunnelInfoRange adds a new vlan filter entry
// Equivalent to: `bridge vlan del dev DEV vid VID-VIDEND tunnel_info id VIN-VINEND [ self ] [ master ]`
func BridgeVlanDelRangeTunnelInfoRange(link Link, vid, vidEnd uint16, tunid, tunidEnd uint32, self, master bool) error {
return pkgHandle.BridgeVlanDelTunnelInfo(link, vid, vidEnd, tunid, tunidEnd, self, master)
return pkgHandle().BridgeVlanDelTunnelInfo(link, vid, vidEnd, tunid, tunidEnd, self, master)
}

func (h *Handle) BridgeVlanDelTunnelInfo(link Link, vid, vidEnd uint16, tunid, tunidEnd uint32, self, master bool) error {
Expand All @@ -219,7 +219,7 @@ func (h *Handle) BridgeVlanDelTunnelInfo(link Link, vid, vidEnd uint16, tunid, t
// BridgeVlanAdd adds a new vlan filter entry
// Equivalent to: `bridge vlan add dev DEV vid VID [ pvid ] [ untagged ] [ self ] [ master ]`
func BridgeVlanAdd(link Link, vid uint16, pvid, untagged, self, master bool) error {
return pkgHandle.BridgeVlanAdd(link, vid, pvid, untagged, self, master)
return pkgHandle().BridgeVlanAdd(link, vid, pvid, untagged, self, master)
}

// BridgeVlanAdd adds a new vlan filter entry
Expand All @@ -231,7 +231,7 @@ func (h *Handle) BridgeVlanAdd(link Link, vid uint16, pvid, untagged, self, mast
// BridgeVlanAddRange adds a new vlan filter entry
// Equivalent to: `bridge vlan add dev DEV vid VID-VIDEND [ pvid ] [ untagged ] [ self ] [ master ]`
func BridgeVlanAddRange(link Link, vid, vidEnd uint16, pvid, untagged, self, master bool) error {
return pkgHandle.BridgeVlanAddRange(link, vid, vidEnd, pvid, untagged, self, master)
return pkgHandle().BridgeVlanAddRange(link, vid, vidEnd, pvid, untagged, self, master)
}

// BridgeVlanAddRange adds a new vlan filter entry
Expand All @@ -243,7 +243,7 @@ func (h *Handle) BridgeVlanAddRange(link Link, vid, vidEnd uint16, pvid, untagge
// BridgeVlanDel adds a new vlan filter entry
// Equivalent to: `bridge vlan del dev DEV vid VID [ pvid ] [ untagged ] [ self ] [ master ]`
func BridgeVlanDel(link Link, vid uint16, pvid, untagged, self, master bool) error {
return pkgHandle.BridgeVlanDel(link, vid, pvid, untagged, self, master)
return pkgHandle().BridgeVlanDel(link, vid, pvid, untagged, self, master)
}

// BridgeVlanDel adds a new vlan filter entry
Expand All @@ -255,7 +255,7 @@ func (h *Handle) BridgeVlanDel(link Link, vid uint16, pvid, untagged, self, mast
// BridgeVlanDelRange adds a new vlan filter entry
// Equivalent to: `bridge vlan del dev DEV vid VID-VIDEND [ pvid ] [ untagged ] [ self ] [ master ]`
func BridgeVlanDelRange(link Link, vid, vidEnd uint16, pvid, untagged, self, master bool) error {
return pkgHandle.BridgeVlanDelRange(link, vid, vidEnd, pvid, untagged, self, master)
return pkgHandle().BridgeVlanDelRange(link, vid, vidEnd, pvid, untagged, self, master)
}

// BridgeVlanDelRange adds a new vlan filter entry
Expand Down Expand Up @@ -333,7 +333,7 @@ func (h *Handle) bridgeVlanModify(cmd int, link Link, vid, vidEnd uint16, tunid,
// BridgeVniAdd adds a new vni filter entry
// Equivalent to: `bridge vni add dev DEV vni VNI`
func BridgeVniAdd(link Link, vni uint32) error {
return pkgHandle.BridgeVniAdd(link, vni)
return pkgHandle().BridgeVniAdd(link, vni)
}

// BridgeVniAdd adds a new vni filter entry
Expand All @@ -345,7 +345,7 @@ func (h *Handle) BridgeVniAdd(link Link, vni uint32) error {
// BridgeVniAddRange adds a new vni filter entry
// Equivalent to: `bridge vni add dev DEV vni VNI-VNIEND`
func BridgeVniAddRange(link Link, vniStart, vniEnd uint32) error {
return pkgHandle.BridgeVniAddRange(link, vniStart, vniEnd)
return pkgHandle().BridgeVniAddRange(link, vniStart, vniEnd)
}

// BridgeVniAddRange adds a new vni filter entry
Expand All @@ -357,7 +357,7 @@ func (h *Handle) BridgeVniAddRange(link Link, vniStart, vniEnd uint32) error {
// BridgeVniDel deletes a vni filter entry
// Equivalent to: `bridge vni del dev DEV vni VNI`
func BridgeVniDel(link Link, vni uint32) error {
return pkgHandle.BridgeVniDel(link, vni)
return pkgHandle().BridgeVniDel(link, vni)
}

// BridgeVniDel deletes a vni filter entry
Expand All @@ -369,7 +369,7 @@ func (h *Handle) BridgeVniDel(link Link, vni uint32) error {
// BridgeVniDelRange deletes a vni filter entry
// Equivalent to: `bridge vni del dev DEV vni VNI-VNIEND`
func BridgeVniDelRange(link Link, vniStart, vniEnd uint32) error {
return pkgHandle.BridgeVniDelRange(link, vniStart, vniEnd)
return pkgHandle().BridgeVniDelRange(link, vniStart, vniEnd)
}

// BridgeVniDelRange deletes a vni filter entry
Expand Down Expand Up @@ -403,7 +403,7 @@ func (h *Handle) bridgeVniModify(cmd int, link Link, vniStart, vniEnd uint32) er
// If the returned error is [ErrDumpInterrupted], results may be inconsistent
// or incomplete.
func BridgeVniList() (map[int32][]*nl.BridgeVniInfo, error) {
return pkgHandle.BridgeVniList()
return pkgHandle().BridgeVniList()
}

// BridgeVniList gets a map of device id to vni filter infos.
Expand Down
6 changes: 3 additions & 3 deletions chain_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
// ChainDel will delete a chain from the system.
func ChainDel(link Link, chain Chain) error {
// Equivalent to: `tc chain del $chain`
return pkgHandle.ChainDel(link, chain)
return pkgHandle().ChainDel(link, chain)
}

// ChainDel will delete a chain from the system.
Expand All @@ -22,7 +22,7 @@ func (h *Handle) ChainDel(link Link, chain Chain) error {
// ChainAdd will add a chain to the system.
// Equivalent to: `tc chain add`
func ChainAdd(link Link, chain Chain) error {
return pkgHandle.ChainAdd(link, chain)
return pkgHandle().ChainAdd(link, chain)
}

// ChainAdd will add a chain to the system.
Expand Down Expand Up @@ -62,7 +62,7 @@ func (h *Handle) chainModify(cmd, flags int, link Link, chain Chain) error {
// If the returned error is [ErrDumpInterrupted], results may be inconsistent
// or incomplete.
func ChainList(link Link, parent uint32) ([]Chain, error) {
return pkgHandle.ChainList(link, parent)
return pkgHandle().ChainList(link, parent)
}

// ChainList gets a list of chains in the system.
Expand Down
10 changes: 5 additions & 5 deletions class_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func NewHtbClass(attrs ClassAttrs, cattrs HtbClassAttrs) *HtbClass {
// ClassDel will delete a class from the system.
// Equivalent to: `tc class del $class`
func ClassDel(class Class) error {
return pkgHandle.ClassDel(class)
return pkgHandle().ClassDel(class)
}

// ClassDel will delete a class from the system.
Expand All @@ -78,7 +78,7 @@ func (h *Handle) ClassDel(class Class) error {
// Equivalent to: `tc class change $class`
// The parent and handle MUST NOT be changed.
func ClassChange(class Class) error {
return pkgHandle.ClassChange(class)
return pkgHandle().ClassChange(class)
}

// ClassChange will change a class in place
Expand All @@ -94,7 +94,7 @@ func (h *Handle) ClassChange(class Class) error {
// If a class already exist with this parent/handle pair, the class is changed.
// If a class does not already exist with this parent/handle, a new class is created.
func ClassReplace(class Class) error {
return pkgHandle.ClassReplace(class)
return pkgHandle().ClassReplace(class)
}

// ClassReplace will replace a class to the system.
Expand All @@ -109,7 +109,7 @@ func (h *Handle) ClassReplace(class Class) error {
// ClassAdd will add a class to the system.
// Equivalent to: `tc class add $class`
func ClassAdd(class Class) error {
return pkgHandle.ClassAdd(class)
return pkgHandle().ClassAdd(class)
}

// ClassAdd will add a class to the system.
Expand Down Expand Up @@ -206,7 +206,7 @@ func classPayload(req *nl.NetlinkRequest, class Class) error {
// If the returned error is [ErrDumpInterrupted], results may be inconsistent
// or incomplete.
func ClassList(link Link, parent uint32) ([]Class, error) {
return pkgHandle.ClassList(link, parent)
return pkgHandle().ClassList(link, parent)
}

// ClassList gets a list of classes in the system.
Expand Down
14 changes: 7 additions & 7 deletions conntrack_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,46 +49,46 @@ type InetFamily uint8
// If the returned error is [ErrDumpInterrupted], results may be inconsistent
// or incomplete.
func ConntrackTableList(table ConntrackTableType, family InetFamily) ([]*ConntrackFlow, error) {
return pkgHandle.ConntrackTableList(table, family)
return pkgHandle().ConntrackTableList(table, family)
}

// ConntrackTableFlush flushes all the flows of a specified table
// conntrack -F [table] Flush table
// The flush operation applies to all the family types
func ConntrackTableFlush(table ConntrackTableType) error {
return pkgHandle.ConntrackTableFlush(table)
return pkgHandle().ConntrackTableFlush(table)
}

// ConntrackCreate creates a new conntrack flow in the desired table
// conntrack -I [table] Create a conntrack or expectation
func ConntrackCreate(table ConntrackTableType, family InetFamily, flow *ConntrackFlow) error {
return pkgHandle.ConntrackCreate(table, family, flow)
return pkgHandle().ConntrackCreate(table, family, flow)
}

// ConntrackUpdate updates an existing conntrack flow in the desired table using the handle
// conntrack -U [table] Update a conntrack
func ConntrackUpdate(table ConntrackTableType, family InetFamily, flow *ConntrackFlow) error {
return pkgHandle.ConntrackUpdate(table, family, flow)
return pkgHandle().ConntrackUpdate(table, family, flow)
}

// ConntrackDelete deletes an existing conntrack flow in the desired table
// conntrack -D [table] Delete conntrack flow
func ConntrackDelete(table ConntrackTableType, family InetFamily, flow *ConntrackFlow) error {
return pkgHandle.ConntrackDelete(table, family, flow)
return pkgHandle().ConntrackDelete(table, family, flow)
}

// ConntrackDeleteFilter deletes entries on the specified table on the base of the filter
// conntrack -D [table] parameters Delete conntrack or expectation
//
// Deprecated: use [ConntrackDeleteFilters] instead.
func ConntrackDeleteFilter(table ConntrackTableType, family InetFamily, filter CustomConntrackFilter) (uint, error) {
return pkgHandle.ConntrackDeleteFilters(table, family, filter)
return pkgHandle().ConntrackDeleteFilters(table, family, filter)
}

// ConntrackDeleteFilters deletes entries on the specified table matching any of the specified filters
// conntrack -D [table] parameters Delete conntrack or expectation
func ConntrackDeleteFilters(table ConntrackTableType, family InetFamily, filters ...CustomConntrackFilter) (uint, error) {
return pkgHandle.ConntrackDeleteFilters(table, family, filters...)
return pkgHandle().ConntrackDeleteFilters(table, family, filters...)
}

// ConntrackTableList returns the flow list of a table of a specific family using the netlink handle passed
Expand Down
Loading
Loading