Skip to content

Commit

Permalink
Rename UDPPacketListener
Browse files Browse the repository at this point in the history
  • Loading branch information
fortuna committed Jan 17, 2024
1 parent 9998332 commit 97b1619
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion network/packet_listener_proxy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
)

func TestWithWriteTimeoutOptionWorks(t *testing.T) {
pl := &transport.UDPPacketListener{}
pl := &transport.UDPListener{}

defProxy, err := NewPacketProxyFromPacketListener(pl)
require.NoError(t, err)
Expand Down
8 changes: 4 additions & 4 deletions transport/packet.go
Original file line number Diff line number Diff line change
Expand Up @@ -152,17 +152,17 @@ type PacketListener interface {
ListenPacket(ctx context.Context) (net.PacketConn, error)
}

// UDPPacketListener is a [PacketListener] that uses the standard [net.ListenConfig].ListenPacket to listen.
type UDPPacketListener struct {
// UDPListener is a [PacketListener] that uses the standard [net.ListenConfig].ListenPacket to listen.
type UDPListener struct {
net.ListenConfig
// The local address to bind to, as specified in [net.ListenPacket].
Address string
}

var _ PacketListener = (*UDPPacketListener)(nil)
var _ PacketListener = (*UDPListener)(nil)

// ListenPacket implements [PacketListener].ListenPacket
func (l UDPPacketListener) ListenPacket(ctx context.Context) (net.PacketConn, error) {
func (l UDPListener) ListenPacket(ctx context.Context) (net.PacketConn, error) {
return l.ListenConfig.ListenPacket(ctx, "udp", l.Address)
}

Expand Down
12 changes: 6 additions & 6 deletions transport/packet_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func TestFuncPacketDialer(t *testing.T) {
// UDPPacketListener

func TestUDPPacketListenerLocalIPv4Addr(t *testing.T) {
listener := &UDPPacketListener{Address: "127.0.0.1:0"}
listener := &UDPListener{Address: "127.0.0.1:0"}
pc, err := listener.ListenPacket(context.Background())
require.NoError(t, err)
require.Equal(t, "udp", pc.LocalAddr().Network())
Expand All @@ -106,7 +106,7 @@ func TestUDPPacketListenerLocalIPv4Addr(t *testing.T) {
}

func TestUDPPacketListenerLocalIPv6Addr(t *testing.T) {
listener := &UDPPacketListener{Address: "[::1]:0"}
listener := &UDPListener{Address: "[::1]:0"}
pc, err := listener.ListenPacket(context.Background())
require.NoError(t, err)
require.Equal(t, "udp", pc.LocalAddr().Network())
Expand All @@ -116,7 +116,7 @@ func TestUDPPacketListenerLocalIPv6Addr(t *testing.T) {
}

func TestUDPPacketListenerLocalhost(t *testing.T) {
listener := &UDPPacketListener{Address: "localhost:0"}
listener := &UDPListener{Address: "localhost:0"}
pc, err := listener.ListenPacket(context.Background())
require.NoError(t, err)
require.Equal(t, "udp", pc.LocalAddr().Network())
Expand All @@ -126,7 +126,7 @@ func TestUDPPacketListenerLocalhost(t *testing.T) {
}

func TestUDPPacketListenerDefaulAddr(t *testing.T) {
listener := &UDPPacketListener{}
listener := &UDPListener{}
pc, err := listener.ListenPacket(context.Background())
require.Equal(t, "udp", pc.LocalAddr().Network())
require.NoError(t, err)
Expand Down Expand Up @@ -169,7 +169,7 @@ func TestPacketListenerDialer(t *testing.T) {
request := []byte("Request")
response := []byte("Response")

serverListener := UDPPacketListener{Address: "127.0.0.1:0"}
serverListener := UDPListener{Address: "127.0.0.1:0"}
serverPacketConn, err := serverListener.ListenPacket(context.Background())
require.NoError(t, err, "Failed to create UDP listener: %v", err)
t.Logf("Listening on %v", serverPacketConn.LocalAddr())
Expand Down Expand Up @@ -202,7 +202,7 @@ func TestPacketListenerDialer(t *testing.T) {
}()

serverEndpoint := &PacketListenerDialer{
Listener: UDPPacketListener{Address: "127.0.0.1:0"},
Listener: UDPListener{Address: "127.0.0.1:0"},
}
conn, err := serverEndpoint.DialPacket(context.Background(), serverPacketConn.LocalAddr().String())
require.NoError(t, err)
Expand Down

0 comments on commit 97b1619

Please sign in to comment.