close connections in case of write errors (#613) (#655)

client_record_test.go

@@ -126,7 +126,7 @@ func readRequestIgnoreFrames(c *conn.Conn) (*base.Request, error) {
 	}
 }
 
-func TestClientRecordSerial(t *testing.T) {
+func TestClientRecord(t *testing.T) {
 	for _, transport := range []string{
 		"udp",
 		"tcp",
@@ -350,7 +350,7 @@ func TestClientRecordSerial(t *testing.T) {
 	}
 }
 
-func TestClientRecordParallel(t *testing.T) {
+func TestClientRecordSocketError(t *testing.T) {
 	for _, transport := range []string{
 		"udp",
 		"tcp",
@@ -446,15 +446,6 @@ func TestClientRecordParallel(t *testing.T) {
 					StatusCode: base.StatusOK,
 				})
 				require.NoError(t, err2)
-
-				req, err2 = readRequestIgnoreFrames(conn)
-				require.NoError(t, err2)
-				require.Equal(t, base.Teardown, req.Method)
-
-				err2 = conn.WriteResponse(&base.Response{
-					StatusCode: base.StatusOK,
-				})
-				require.NoError(t, err2)
 			}()
 
 			c := Client{
@@ -471,9 +462,6 @@ func TestClientRecordParallel(t *testing.T) {
 				}(),
 			}
 
-			writerDone := make(chan struct{})
-			defer func() { <-writerDone }()
-
 			medi := testH264Media
 			medias := []*description.Media{medi}
 
@@ -481,21 +469,15 @@ func TestClientRecordParallel(t *testing.T) {
 			require.NoError(t, err)
 			defer c.Close()
 
-			go func() {
-				defer close(writerDone)
+			ti := time.NewTicker(50 * time.Millisecond)
+			defer ti.Stop()
 
-				t := time.NewTicker(50 * time.Millisecond)
-				defer t.Stop()
-
-				for range t.C {
-					err := c.WritePacketRTP(medi, &testRTPPacket)
-					if err != nil {
-						return
-					}
+			for range ti.C {
+				err := c.WritePacketRTP(medi, &testRTPPacket)
+				if err != nil {
+					break
 				}
-			}()
-
-			time.Sleep(1 * time.Second)
+			}
 		})
 	}
 }
@@ -645,143 +627,6 @@ func TestClientRecordPauseSerial(t *testing.T) {
 	}
 }
 
-func TestClientRecordPauseParallel(t *testing.T) {
-	for _, transport := range []string{
-		"udp",
-		"tcp",
-	} {
-		t.Run(transport, func(t *testing.T) {
-			l, err := net.Listen("tcp", "localhost:8554")
-			require.NoError(t, err)
-			defer l.Close()
-
-			serverDone := make(chan struct{})
-			defer func() { <-serverDone }()
-			go func() {
-				defer close(serverDone)
-
-				nconn, err2 := l.Accept()
-				require.NoError(t, err2)
-				defer nconn.Close()
-				conn := conn.NewConn(nconn)
-
-				req, err2 := conn.ReadRequest()
-				require.NoError(t, err2)
-				require.Equal(t, base.Options, req.Method)
-
-				err2 = conn.WriteResponse(&base.Response{
-					StatusCode: base.StatusOK,
-					Header: base.Header{
-						"Public": base.HeaderValue{strings.Join([]string{
-							string(base.Announce),
-							string(base.Setup),
-							string(base.Record),
-							string(base.Pause),
-						}, ", ")},
-					},
-				})
-				require.NoError(t, err2)
-
-				req, err2 = conn.ReadRequest()
-				require.NoError(t, err2)
-				require.Equal(t, base.Announce, req.Method)
-
-				err2 = conn.WriteResponse(&base.Response{
-					StatusCode: base.StatusOK,
-				})
-				require.NoError(t, err2)
-
-				req, err2 = conn.ReadRequest()
-				require.NoError(t, err2)
-				require.Equal(t, base.Setup, req.Method)
-
-				var inTH headers.Transport
-				err2 = inTH.Unmarshal(req.Header["Transport"])
-				require.NoError(t, err2)
-
-				th := headers.Transport{
-					Delivery: deliveryPtr(headers.TransportDeliveryUnicast),
-				}
-
-				if transport == "udp" {
-					th.Protocol = headers.TransportProtocolUDP
-					th.ServerPorts = &[2]int{34556, 34557}
-					th.ClientPorts = inTH.ClientPorts
-				} else {
-					th.Protocol = headers.TransportProtocolTCP
-					th.InterleavedIDs = inTH.InterleavedIDs
-				}
-
-				err2 = conn.WriteResponse(&base.Response{
-					StatusCode: base.StatusOK,
-					Header: base.Header{
-						"Transport": th.Marshal(),
-					},
-				})
-				require.NoError(t, err2)
-
-				req, err2 = conn.ReadRequest()
-				require.NoError(t, err2)
-				require.Equal(t, base.Record, req.Method)
-
-				err2 = conn.WriteResponse(&base.Response{
-					StatusCode: base.StatusOK,
-				})
-				require.NoError(t, err2)
-
-				req, err2 = readRequestIgnoreFrames(conn)
-				require.NoError(t, err2)
-				require.Equal(t, base.Pause, req.Method)
-
-				err2 = conn.WriteResponse(&base.Response{
-					StatusCode: base.StatusOK,
-				})
-				require.NoError(t, err2)
-			}()
-
-			c := Client{
-				Transport: func() *Transport {
-					if transport == "udp" {
-						v := TransportUDP
-						return &v
-					}
-					v := TransportTCP
-					return &v
-				}(),
-			}
-
-			medi := testH264Media
-			medias := []*description.Media{medi}
-
-			err = record(&c, "rtsp://localhost:8554/teststream", medias, nil)
-			require.NoError(t, err)
-
-			writerDone := make(chan struct{})
-			go func() {
-				defer close(writerDone)
-
-				t := time.NewTicker(50 * time.Millisecond)
-				defer t.Stop()
-
-				for range t.C {
-					err2 := c.WritePacketRTP(medi, &testRTPPacket)
-					if err2 != nil {
-						return
-					}
-				}
-			}()
-
-			time.Sleep(1 * time.Second)
-
-			_, err = c.Pause()
-			require.NoError(t, err)
-
-			c.Close()
-			<-writerDone
-		})
-	}
-}
-
 func TestClientRecordAutomaticProtocol(t *testing.T) {
 	l, err := net.Listen("tcp", "localhost:8554")
 	require.NoError(t, err)