Skip to content
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

Use netip.Addr instead of net.IP #36

Merged
merged 3 commits into from
Oct 16, 2023
Merged

Use netip.Addr instead of net.IP #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e1ce55
Fix BenchmarkFlowUnmarshal
antoninbas Oct 4, 2023
fe3ea21
Add BenchmarkIPTupleUnmarshal
antoninbas Oct 5, 2023
479366a
Use netip.Addr instead of net.IP
antoninbas Oct 5, 2023
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
16 changes: 8 additions & 8 deletions conn_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package conntrack_test
import (
"fmt"
"log"
"net"
"net/netip"
"testing"

"github.com/mdlayher/netlink"
Expand Down Expand Up @@ -34,8 +34,8 @@ func ExampleConn_createUpdateFlow() {
// Set up a new Flow object using a given set of attributes.
f := conntrack.NewFlow(
17, 0,
net.ParseIP("2a00:1450:400e:804::200e"),
net.ParseIP("2a00:1450:400e:804::200f"),
netip.MustParseAddr("2a00:1450:400e:804::200e"),
netip.MustParseAddr("2a00:1450:400e:804::200f"),
1234, 80, 120, 0,
)

Expand Down Expand Up @@ -72,12 +72,12 @@ func ExampleConn_dumpFilter() {
}

f1 := conntrack.NewFlow(
6, 0, net.IPv4(1, 2, 3, 4), net.IPv4(5, 6, 7, 8),
6, 0, netip.MustParseAddr("1.2.3.4"), netip.MustParseAddr("5.6.7.8"),
1234, 80, 120, 0x00ff, // Set a connection mark
)

f2 := conntrack.NewFlow(
17, 0, net.ParseIP("2a00:1450:400e:804::200e"), net.ParseIP("2a00:1450:400e:804::200f"),
17, 0, netip.MustParseAddr("2a00:1450:400e:804::200e"), netip.MustParseAddr("2a00:1450:400e:804::200f"),
1234, 80, 120, 0xff00, // Set a connection mark
)

Expand Down Expand Up @@ -116,12 +116,12 @@ func ExampleConn_flushFilter() {
}

f1 := conntrack.NewFlow(
6, 0, net.IPv4(1, 2, 3, 4), net.IPv4(5, 6, 7, 8),
6, 0, netip.MustParseAddr("1.2.3.4"), netip.MustParseAddr("5.6.7.8"),
1234, 80, 120, 0x00ff, // Set a connection mark
)

f2 := conntrack.NewFlow(
17, 0, net.ParseIP("2a00:1450:400e:804::200e"), net.ParseIP("2a00:1450:400e:804::200f"),
17, 0, netip.MustParseAddr("2a00:1450:400e:804::200e"), netip.MustParseAddr("2a00:1450:400e:804::200f"),
1234, 80, 120, 0xff00, // Set a connection mark
)

Expand Down Expand Up @@ -155,7 +155,7 @@ func ExampleConn_delete() {
}

f := conntrack.NewFlow(
6, 0, net.IPv4(1, 2, 3, 4), net.IPv4(5, 6, 7, 8),
6, 0, netip.MustParseAddr("1.2.3.4"), netip.MustParseAddr("5.6.7.8"),
1234, 80, 120, 0,
)

Expand Down
4 changes: 2 additions & 2 deletions event_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
package conntrack

import (
"net"
"net/netip"
"testing"

"github.com/mdlayher/netlink"
Expand Down Expand Up @@ -43,7 +43,7 @@ func TestConnListen(t *testing.T) {

var warn bool

ip := net.ParseIP("::f00")
ip := netip.MustParseAddr("::f00")
for _, proto := range []uint8{unix.IPPROTO_TCP, unix.IPPROTO_UDP, unix.IPPROTO_DCCP, unix.IPPROTO_SCTP} {
// Create the Flow.
f := NewFlow(
Expand Down
12 changes: 6 additions & 6 deletions expect_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
package conntrack

import (
"net"
"net/netip"
"testing"

"golang.org/x/sys/unix"
Expand All @@ -27,7 +27,7 @@ func TestConnCreateExpect(t *testing.T) {
c, _, err := makeNSConn()
require.NoError(t, err)

f := NewFlow(6, 0, net.IPv4(1, 2, 3, 4), net.IPv4(5, 6, 7, 8), 42000, 21, 120, 0)
f := NewFlow(6, 0, netip.MustParseAddr("1.2.3.4"), netip.MustParseAddr("5.6.7.8"), 42000, 21, 120, 0)

err = c.Create(f)
require.NoError(t, err, "unexpected error creating flow", f)
Expand All @@ -37,8 +37,8 @@ func TestConnCreateExpect(t *testing.T) {
TupleMaster: f.TupleOrig,
Tuple: Tuple{
IP: IPTuple{
SourceAddress: net.IPv4(1, 2, 3, 4),
DestinationAddress: net.IPv4(5, 6, 7, 8),
SourceAddress: netip.MustParseAddr("1.2.3.4"),
DestinationAddress: netip.MustParseAddr("5.6.7.8"),
},
Proto: ProtoTuple{
Protocol: 6,
Expand All @@ -48,8 +48,8 @@ func TestConnCreateExpect(t *testing.T) {
},
Mask: Tuple{
IP: IPTuple{
SourceAddress: net.IPv4(255, 255, 255, 255),
DestinationAddress: net.IPv4(255, 255, 255, 255),
SourceAddress: netip.MustParseAddr("255.255.255.255"),
DestinationAddress: netip.MustParseAddr("255.255.255.255"),
},
Proto: ProtoTuple{
Protocol: 6,
Expand Down
39 changes: 14 additions & 25 deletions expect_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package conntrack

import (
"net"
"net/netip"
"testing"

"github.com/google/go-cmp/cmp"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/ti-mo/netfilter"
Expand Down Expand Up @@ -183,8 +182,8 @@ var corpusExpect = []struct {
exp: Expect{
TupleMaster: Tuple{
IP: IPTuple{
SourceAddress: []byte{127, 0, 0, 1},
DestinationAddress: []byte{127, 0, 0, 2},
SourceAddress: netip.MustParseAddr("127.0.0.1"),
DestinationAddress: netip.MustParseAddr("127.0.0.2"),
},
Proto: ProtoTuple{
Protocol: 6,
Expand All @@ -194,8 +193,8 @@ var corpusExpect = []struct {
},
Tuple: Tuple{
IP: IPTuple{
SourceAddress: []byte{127, 0, 0, 1},
DestinationAddress: []byte{127, 0, 0, 2},
SourceAddress: netip.MustParseAddr("127.0.0.1"),
DestinationAddress: netip.MustParseAddr("127.0.0.2"),
},
Proto: ProtoTuple{
Protocol: 6,
Expand All @@ -204,8 +203,8 @@ var corpusExpect = []struct {
},
Mask: Tuple{
IP: IPTuple{
SourceAddress: []byte{255, 255, 255, 255},
DestinationAddress: []byte{255, 255, 255, 255},
SourceAddress: netip.MustParseAddr("255.255.255.255"),
DestinationAddress: netip.MustParseAddr("255.255.255.255"),
},
Proto: ProtoTuple{
Protocol: 6,
Expand Down Expand Up @@ -263,11 +262,8 @@ func TestExpectUnmarshal(t *testing.T) {
for _, tt := range corpusExpect {
t.Run(tt.name, func(t *testing.T) {
var ex Expect
assert.NoError(t, ex.unmarshal(mustDecodeAttributes(tt.attrs)))

if diff := cmp.Diff(tt.exp, ex); diff != "" {
t.Fatalf("unexpected unmarshal (-want +got):\n%s", diff)
}
require.NoError(t, ex.unmarshal(mustDecodeAttributes(tt.attrs)))
assert.Equal(t, tt.exp, ex, "unexpected unmarshal")
})
}

Expand Down Expand Up @@ -355,9 +351,7 @@ func TestExpectMarshal(t *testing.T) {
},
}

if diff := cmp.Diff(want, exm); diff != "" {
t.Fatalf("unexpected Expect marshal (-want +got):\n%s", diff)
}
assert.Equal(t, want, exm, "unexpected Expect marshal")

// Cannot marshal without tuple/mask/master Tuples
_, err = Expect{}.marshal()
Expand Down Expand Up @@ -424,10 +418,7 @@ func TestExpectNATUnmarshal(t *testing.T) {
}

require.NoError(t, err)

if diff := cmp.Diff(tt.enat, enat); diff != "" {
t.Fatalf("unexpected unmarshal (-want +got):\n%s", diff)
}
assert.Equal(t, tt.enat, enat, "unexpected unmarshal")
})
}
}
Expand All @@ -439,8 +430,8 @@ func TestExpectNATMarshal(t *testing.T) {
Direction: true,
Tuple: Tuple{
IP: IPTuple{
SourceAddress: net.ParseIP("baa:baa::b"),
DestinationAddress: net.ParseIP("ef00:3f00::ba13"),
SourceAddress: netip.MustParseAddr("baa:baa::b"),
DestinationAddress: netip.MustParseAddr("ef00:3f00::ba13"),
},
Proto: ProtoTuple{
Protocol: 13,
Expand All @@ -458,9 +449,7 @@ func TestExpectNATMarshal(t *testing.T) {

// Only verify first attribute (direction); Tuple marshal has its own tests
want := netfilter.Attribute{Type: uint16(ctaExpectNATDir), Data: []byte{0, 0, 0, 1}}
if diff := cmp.Diff(want, enm.Children[0]); diff != "" {
t.Fatalf("unexpected ExpectNAT marshal (-want +got):\n%s", diff)
}
assert.Equal(t, want, enm.Children[0], "unexpected ExpectNAT marshal")
}

func TestExpectTypeString(t *testing.T) {
Expand Down
8 changes: 3 additions & 5 deletions filter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package conntrack
import (
"testing"

"github.com/ti-mo/netfilter"
"github.com/stretchr/testify/assert"

"github.com/google/go-cmp/cmp"
"github.com/ti-mo/netfilter"
)

func TestFilterMarshal(t *testing.T) {
Expand All @@ -22,7 +22,5 @@ func TestFilterMarshal(t *testing.T) {
},
}

if diff := cmp.Diff(fm, f.marshal()); diff != "" {
t.Fatalf("unexpected Filter marshal (-want +got):\n%s", diff)
}
assert.Equal(t, fm, f.marshal(), "unexpected Filter marshal")
}
4 changes: 2 additions & 2 deletions flow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package conntrack

import (
"fmt"
"net"
"net/netip"

"github.com/mdlayher/netlink"
"github.com/ti-mo/netfilter"
Expand Down Expand Up @@ -44,7 +44,7 @@ type Flow struct {
// source and destination addresses. srcPort and dstPort are the source and
// destination ports. timeout is the non-zero time-to-live of a connection in
// seconds.
func NewFlow(proto uint8, status StatusFlag, srcAddr, destAddr net.IP,
func NewFlow(proto uint8, status StatusFlag, srcAddr, destAddr netip.Addr,
srcPort, destPort uint16, timeout, mark uint32) Flow {

var f Flow
Expand Down
Loading
Loading