Skip to content

Commit 298ff27

Browse files
thaJeztahaboch
authored andcommitted
Handle: add ConntrackDeleteFilter alias for backward compat
Commit c96b03b changed the signature of this method to accept a list of filters and renamed it to ConntrackDeleteFilters (plural). This patch - adds back ConntrackDeleteFilter as an alias - marks it as deprecated in favor of the new version. - adds missing stubs for other platforms Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 5b0b9d8 commit 298ff27

File tree

2 files changed

+29
-0
lines changed

2 files changed

+29
-0
lines changed

conntrack_linux.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ func ConntrackUpdate(table ConntrackTableType, family InetFamily, flow *Conntrac
6969

7070
// ConntrackDeleteFilter deletes entries on the specified table on the base of the filter
7171
// conntrack -D [table] parameters Delete conntrack or expectation
72+
//
73+
// Deprecated: use [ConntrackDeleteFilter] instead.
7274
func ConntrackDeleteFilter(table ConntrackTableType, family InetFamily, filter CustomConntrackFilter) (uint, error) {
7375
return pkgHandle.ConntrackDeleteFilters(table, family, filter)
7476
}
@@ -139,6 +141,14 @@ func (h *Handle) ConntrackUpdate(table ConntrackTableType, family InetFamily, fl
139141
return err
140142
}
141143

144+
// ConntrackDeleteFilter deletes entries on the specified table on the base of the filter using the netlink handle passed
145+
// conntrack -D [table] parameters Delete conntrack or expectation
146+
//
147+
// Deprecated: use [Handle.ConntrackDeleteFilters] instead.
148+
func (h *Handle) ConntrackDeleteFilter(table ConntrackTableType, family InetFamily, filter CustomConntrackFilter) (uint, error) {
149+
return h.ConntrackDeleteFilters(table, family, filter)
150+
}
151+
142152
// ConntrackDeleteFilters deletes entries on the specified table matching any of the specified filters using the netlink handle passed
143153
// conntrack -D [table] parameters Delete conntrack or expectation
144154
func (h *Handle) ConntrackDeleteFilters(table ConntrackTableType, family InetFamily, filters ...CustomConntrackFilter) (uint, error) {

conntrack_unspecified.go

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ type InetFamily uint8
1111
// ConntrackFlow placeholder
1212
type ConntrackFlow struct{}
1313

14+
// CustomConntrackFilter placeholder
15+
type CustomConntrackFilter struct{}
16+
1417
// ConntrackFilter placeholder
1518
type ConntrackFilter struct{}
1619

@@ -29,10 +32,18 @@ func ConntrackTableFlush(table ConntrackTableType) error {
2932

3033
// ConntrackDeleteFilter deletes entries on the specified table on the base of the filter
3134
// conntrack -D [table] parameters Delete conntrack or expectation
35+
//
36+
// Deprecated: use [ConntrackDeleteFilter] instead.
3237
func ConntrackDeleteFilter(table ConntrackTableType, family InetFamily, filter *ConntrackFilter) (uint, error) {
3338
return 0, ErrNotImplemented
3439
}
3540

41+
// ConntrackDeleteFilters deletes entries on the specified table matching any of the specified filters
42+
// conntrack -D [table] parameters Delete conntrack or expectation
43+
func ConntrackDeleteFilters(table ConntrackTableType, family InetFamily, filters ...CustomConntrackFilter) (uint, error) {
44+
return 0, ErrNotImplemented
45+
}
46+
3647
// ConntrackTableList returns the flow list of a table of a specific family using the netlink handle passed
3748
// conntrack -L [table] [options] List conntrack or expectation table
3849
func (h *Handle) ConntrackTableList(table ConntrackTableType, family InetFamily) ([]*ConntrackFlow, error) {
@@ -48,6 +59,14 @@ func (h *Handle) ConntrackTableFlush(table ConntrackTableType) error {
4859

4960
// ConntrackDeleteFilter deletes entries on the specified table on the base of the filter using the netlink handle passed
5061
// conntrack -D [table] parameters Delete conntrack or expectation
62+
//
63+
// Deprecated: use [Handle.ConntrackDeleteFilters] instead.
5164
func (h *Handle) ConntrackDeleteFilter(table ConntrackTableType, family InetFamily, filter *ConntrackFilter) (uint, error) {
5265
return 0, ErrNotImplemented
5366
}
67+
68+
// ConntrackDeleteFilters deletes entries on the specified table matching any of the specified filters using the netlink handle passed
69+
// conntrack -D [table] parameters Delete conntrack or expectation
70+
func (h *Handle) ConntrackDeleteFilters(table ConntrackTableType, family InetFamily, filters ...CustomConntrackFilter) (uint, error) {
71+
return 0, ErrNotImplemented
72+
}

0 commit comments

Comments
 (0)