Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion connectivity_vnet_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package ice

import (
"context"
"errors"
"fmt"
"net"
"sync/atomic"
Expand Down Expand Up @@ -790,7 +791,9 @@ func TestWriteUseValidPair(t *testing.T) {
go func() {
for {
if _, writeErr := (&Conn{agent: controllingAgent}).Write(testMessage); writeErr != nil {
return
if !errors.Is(writeErr, ErrNoCandidatePairs) {
return
}
}

time.Sleep(20 * time.Millisecond)
Expand Down
6 changes: 4 additions & 2 deletions selection_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,10 @@ func TestBindingRequestHandler(t *testing.T) {
assert.NotNil(t, candidatePair)
assert.NoError(t, err)

// Sending will fail, we no longer have a selected candidate pair
require.False(t, sendUntilDone(t, controlledConn, controllingConn, 20))
// Sending will fail, we no longer have a selected candidate pair.
n, writeErr := controlledConn.Write([]byte("Hello World"))
require.Zero(t, n)
require.ErrorIs(t, writeErr, ErrNoCandidatePairs)

// Send STUN Binding requests until a new Selected Candidate Pair has been set by BindingRequestHandler
switchToNewCandidatePair.Store(true)
Expand Down
2 changes: 1 addition & 1 deletion transport.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ func (c *Conn) Write(packet []byte) (int, error) {
}

if pair == nil {
return 0, err
return 0, ErrNoCandidatePairs
}
}

Expand Down
32 changes: 32 additions & 0 deletions transport_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,38 @@ func TestConn_Write_RejectsSTUN(t *testing.T) {
require.ErrorIs(t, werr, errWriteSTUNMessageToIceConn)
}

func TestStartDialConnWriteBeforeConnectReturnsError(t *testing.T) {
defer test.CheckRoutines(t)()
defer test.TimeOut(10 * time.Second).Stop()

cfg := &AgentConfig{
NetworkTypes: supportedNetworkTypes(),
MulticastDNSMode: MulticastDNSModeDisabled,
}
agent, err := NewAgent(cfg)
require.NoError(t, err)
defer func() {
require.NoError(t, agent.Close())
}()

b, err := NewAgent(cfg)
require.NoError(t, err)
defer func() {
require.NoError(t, b.Close())
}()

bUfrag, bPwd, err := b.GetLocalUserCredentials()
require.NoError(t, err)

conn, err := agent.StartDial(bUfrag, bPwd)
require.NoError(t, err)

n, werr := conn.Write([]byte("early application data"))
require.Zero(t, n)
require.ErrorIs(t, werr, ErrNoCandidatePairs)
require.Zero(t, conn.BytesSent())
}

func TestConn_GetCandidatePairsInfo(t *testing.T) {
defer test.CheckRoutines(t)()
defer test.TimeOut(10 * time.Second).Stop()
Expand Down
Loading