Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on Aug 30, 2024. It is now read-only.

fix: Close Ping DataChannel when connection ends #382

Merged
merged 1 commit into from
Jul 14, 2021
Merged

fix: Close Ping DataChannel when connection ends #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion wsnet/dial.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func Dial(conn net.Conn, iceServers []webrtc.ICEServer) (*Dialer, error) {
ctrl: ctrl,
rtc: rtc,
closedChan: make(chan struct{}),
connClosers: make([]io.Closer, 0),
connClosers: []io.Closer{ctrl},
}

return dialer, dialer.negotiate()
Expand Down
43 changes: 43 additions & 0 deletions wsnet/dial_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ func ExampleDial_basic() {
// nolint:gocognit,gocyclo
func TestDial(t *testing.T) {
t.Run("Ping", func(t *testing.T) {
t.Parallel()

connectAddr, listenAddr := createDumbBroker(t)
_, err := Listen(context.Background(), listenAddr)
if err != nil {
Expand All @@ -67,7 +69,38 @@ func TestDial(t *testing.T) {
}
})

t.Run("Ping Close", func(t *testing.T) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
t.Run("Ping Close", func(t *testing.T) {
t.Run("PingClose", func(t *testing.T) {

t.Parallel()

connectAddr, listenAddr := createDumbBroker(t)
_, err := Listen(context.Background(), listenAddr)
if err != nil {
t.Error(err)
return
}
turnAddr, closeTurn := createTURNServer(t, ice.SchemeTypeTURN)
dialer, err := DialWebsocket(context.Background(), connectAddr, []webrtc.ICEServer{{
URLs: []string{fmt.Sprintf("turn:%s", turnAddr)},
Username: "example",
Credential: testPass,
CredentialType: webrtc.ICECredentialTypePassword,
}})
if err != nil {
t.Error(err)
return
}
_ = dialer.Ping(context.Background())
closeTurn()
err = dialer.Ping(context.Background())
if err != io.EOF {
t.Error(err)
return
}
})

t.Run("OPError", func(t *testing.T) {
t.Parallel()

connectAddr, listenAddr := createDumbBroker(t)
_, err := Listen(context.Background(), listenAddr)
if err != nil {
Expand All @@ -91,6 +124,8 @@ func TestDial(t *testing.T) {
})

t.Run("Proxy", func(t *testing.T) {
t.Parallel()

listener, err := net.Listen("tcp", "0.0.0.0:0")
if err != nil {
t.Error(err)
Expand Down Expand Up @@ -134,6 +169,8 @@ func TestDial(t *testing.T) {

// Expect that we'd get an EOF on the server closing.
t.Run("EOF on Close", func(t *testing.T) {
t.Parallel()

listener, err := net.Listen("tcp", "0.0.0.0:0")
if err != nil {
t.Error(err)
Expand Down Expand Up @@ -167,6 +204,8 @@ func TestDial(t *testing.T) {
})

t.Run("Disconnect", func(t *testing.T) {
t.Parallel()

connectAddr, listenAddr := createDumbBroker(t)
_, err := Listen(context.Background(), listenAddr)
if err != nil {
Expand All @@ -190,6 +229,8 @@ func TestDial(t *testing.T) {
})

t.Run("Disconnect DialContext", func(t *testing.T) {
t.Parallel()

tcpListener, err := net.Listen("tcp", "0.0.0.0:0")
if err != nil {
t.Error(err)
Expand Down Expand Up @@ -232,6 +273,8 @@ func TestDial(t *testing.T) {
})

t.Run("Closed", func(t *testing.T) {
t.Parallel()

connectAddr, listenAddr := createDumbBroker(t)
_, err := Listen(context.Background(), listenAddr)
if err != nil {
Expand Down
5 changes: 4 additions & 1 deletion wsnet/rtc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ func newPeerConnection(servers []webrtc.ICEServer) (*webrtc.PeerConnection, erro
se.SetNetworkTypes([]webrtc.NetworkType{webrtc.NetworkTypeUDP4})
se.SetSrflxAcceptanceMinWait(0)
se.DetachDataChannels()
se.SetICETimeouts(time.Second*5, time.Second*5, time.Second*2)
se.SetICETimeouts(time.Second*3, time.Second*3, time.Second*2)
lf := logging.NewDefaultLoggerFactory()
lf.DefaultLogLevel = logging.LogLevelDisabled
se.LoggerFactory = lf
Expand Down Expand Up @@ -252,6 +252,9 @@ func waitForDataChannelOpen(ctx context.Context, channel *webrtc.DataChannel) er
if channel.ReadyState() == webrtc.DataChannelStateOpen {
return nil
}
if channel.ReadyState() != webrtc.DataChannelStateConnecting {
return fmt.Errorf("channel closed")
}
ctx, cancelFunc := context.WithTimeout(ctx, time.Second*15)
defer cancelFunc()
channel.OnOpen(func() {
Expand Down