Merge pull request #31 from danielpaulus/fixFrameExtractor

Fix zlp bug

Author: danielpaulus

screencapture/activator.go

@@ -32,11 +32,11 @@ func enableQTConfigSingleDevice(device IosDevice) error {
 	if err != nil {
 		return err
 	}
-	duration, _ := time.ParseDuration("500ms")
+
 	var i int
 	for {
 		log.Infof("Checking for active QT config for %s", udid)
-		time.Sleep(duration)
+		time.Sleep(500 * time.Millisecond)
 		err = ctx.Close()
 		if err != nil {
 			log.Warn("failed closing context", err)
@@ -64,8 +64,7 @@ func sendQTConfigControlRequest(device IosDevice) error {
 	val, err := device.usbDevice.Control(0x40, 0x52, 0x00, 0x02, response)
 
 	if err != nil {
-		log.Fatal("Failed sending control transfer for enabling hidden QT config", err)
-		return err
+		log.Warn("Failed sending control transfer for enabling hidden QT config. Seems like this happens sometimes but it still works usually.", err)
 	}
 	log.Debugf("Enabling QT config RC:%d", val)
 	return nil

screencapture/frameextractor.go

@@ -32,6 +32,9 @@ func (fe *LengthFieldBasedFrameExtractor) ExtractFrame(bytes []byte) ([]byte, bo
 		return fe.handleNewFrame(bytes)
 	}
 	if fe.readyForNextFrame && fe.frameBuffer.Len() != 0 {
+		if fe.frameBuffer.Len()<4{
+			log.Fatal("wtf:"+hex.Dump(fe.frameBuffer.Bytes()))
+		}
 		fe.nextFrameSize = int(binary.LittleEndian.Uint32(fe.frameBuffer.Next(4))) - 4
 		fe.readyForNextFrame = false
 		return fe.ExtractFrame(bytes)
@@ -50,6 +53,11 @@ func (fe *LengthFieldBasedFrameExtractor) ExtractFrame(bytes []byte) ([]byte, bo
 }
 
 func (fe *LengthFieldBasedFrameExtractor) handleNewFrame(bytes []byte) ([]byte, bool) {
+	//ZeroLengthPackages are sometimes sent on USB Connections. It is safe to ignore them.
+	if len(bytes) == 0 {
+		log.Debugf("skipping 0")
+		return nil, false
+	}
 	if len(bytes) < 4 {
 		log.Fatalf("Received less than four bytes, cannot read a valid frameLength field: %s", hex.Dump(bytes))
 	}
@@ -66,4 +74,4 @@ func (fe *LengthFieldBasedFrameExtractor) handleNewFrame(bytes []byte) ([]byte,
 	fe.frameBuffer.Write(bytes[4:])
 	fe.nextFrameSize = frameLength - 4
 	return nil, false
-}
+}

screencapture/frameextractor_test.go

@@ -18,6 +18,13 @@ func TestCompletePacket(t *testing.T) {
 	frame1, frameReturned2 := fe.ExtractFrame(small)
 	assert.True(t, frameReturned2)
 	assert.Equal(t, small[4:], frame1)
+
+}
+
+func TestZeroLengthPacket(t *testing.T) {
+	fe := screencapture.NewLengthFieldBasedFrameExtractor()
+	_, frameReturned := fe.ExtractFrame(make([]byte, 0))
+	assert.False(t, frameReturned)
 }
 
 func TestIncompletePacket(t *testing.T) {