From a87612049dba12a5fec50b62ec2fa03a188e529a Mon Sep 17 00:00:00 2001
From: Zack Scholl <zack.scholl@gmail.com>
Date: Wed, 13 Nov 2019 07:27:30 -0800
Subject: [PATCH] fix

---
 src/croc/croc.go   | 41 ++++++++++++++++++++++++++++++++++++-----
 src/relay/relay.go |  2 +-
 2 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/src/croc/croc.go b/src/croc/croc.go
index dae9795..54bb568 100644
--- a/src/croc/croc.go
+++ b/src/croc/croc.go
@@ -277,6 +277,7 @@ func (c *Client) connectToRelay() (err error) {
 				log.Error(err)
 				return
 			}
+			break
 		} else {
 			log.Debug("unknown: %s", wsmsg)
 		}
@@ -289,6 +290,9 @@ func (c *Client) connectToRelay() (err error) {
 				log.Error(err)
 				return
 			}
+			if wsreply.Message == "[8] answer" {
+				break
+			}
 		}
 	}
 	err = <-finished
@@ -343,8 +347,8 @@ func (c *Client) CreateOfferer(finished chan<- error) (pc *webrtc.PeerConnection
 		return
 	}
 
-	ordered := false
-	maxRetransmits := uint16(0)
+	ordered := true
+	maxRetransmits := uint16(3)
 	var id uint16 = 5
 	options := &webrtc.DataChannelInit{
 		Ordered:        &ordered,
@@ -375,8 +379,17 @@ func (c *Client) CreateOfferer(finished chan<- error) (pc *webrtc.PeerConnection
 		return nil
 	}
 
+	var readyToBegin = false
+	var readyToEnd = false
+
 	dc.OnOpen(func() {
 		if c.Options.IsSender {
+			for {
+				time.Sleep(10 * time.Millisecond)
+				if readyToBegin {
+					break
+				}
+			}
 			log.Debug("sending file")
 			pos := uint64(0)
 			f, errOpen := os.Open("croc1")
@@ -404,7 +417,7 @@ func (c *Client) CreateOfferer(finished chan<- error) (pc *webrtc.PeerConnection
 					return
 				}
 				pos += uint64(n)
-				time.Sleep(3 * time.Millisecond)
+				time.Sleep(1 * time.Millisecond)
 			}
 			log.Debug(float64(fstat.Size()) / float64(time.Since(timeStart).Seconds()) / 1000000)
 			err2 := sendData([]byte{1, 2, 3})
@@ -412,9 +425,18 @@ func (c *Client) CreateOfferer(finished chan<- error) (pc *webrtc.PeerConnection
 				finished <- err2
 				return
 			}
-
+			for {
+				time.Sleep(10 * time.Millisecond)
+				if readyToEnd {
+					break
+				}
+			}
 			finished <- nil
 
+		} else {
+			sendData([]byte{2, 3, 4})
+			sendData([]byte{2, 3, 4})
+			sendData([]byte{2, 3, 4})
 		}
 	})
 
@@ -433,12 +455,21 @@ func (c *Client) CreateOfferer(finished chan<- error) (pc *webrtc.PeerConnection
 		if bytes.Equal(dcMsg.Data, []byte{1, 2, 3}) {
 			log.Debug("received magic")
 			fwrite.Close()
+			sendData([]byte{1, 3, 4})
+			time.Sleep(100 * time.Millisecond)
 			finished <- nil
 			return
+		} else if bytes.Equal(dcMsg.Data, []byte{2, 3, 4}) {
+			log.Debug("got ready to begin")
+			readyToBegin = true
+			return
+		} else if bytes.Equal(dcMsg.Data, []byte{1, 3, 4}) {
+			log.Debug("got ready to end")
+			readyToEnd = true
+			return
 		}
 		err = box.Unbundle(string(dcMsg.Data), c.Key, &fd)
 		if err == nil {
-			// log.Debug(fd.Position)
 			fwrite.Write(fd.Data)
 		} else {
 			log.Error(err)
diff --git a/src/relay/relay.go b/src/relay/relay.go
index d1dc970..a3aaaa2 100644
--- a/src/relay/relay.go
+++ b/src/relay/relay.go
@@ -210,5 +210,5 @@ func Run() (err error) {
 		log.Debugf("[%s] new connection %+v", room, c)
 		s.readPump()
 	})
-	return router.Run(":8005")
+	return router.Run(":8018")
 }