mirrors_public/schollz_croc
0
0
Fork 0
mirror of https://github.com/schollz/croc.git synced 2025-10-11 21:30:16 +02:00
Code Activity

dunno

Browse source
This commit is contained in:
Zack Scholl 2019-09-07 06:25:13 -07:00
parent fb658ccde2
commit ee75d2c8ef
4 changed files with 49 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/croc/croc.go
View file

@ -30,6 +30,7 @@ import (
"github.com/schollz/peerdiscovery"
"github.com/schollz/progressbar/v2"
"github.com/schollz/spinner"
"golang.org/x/exp/mmap"
)
func init() {
@ -91,6 +92,7 @@ type Client struct {
firstSend bool
mutex *sync.Mutex
fread *mmap.ReaderAt
quit chan bool
}
@ -843,6 +845,15 @@ func (c *Client) updateState() (err error) {
c.setBar()
c.TotalSent = 0
log.Debug("beginning sending comms")
pathToFile := path.Join(
c.FilesToTransfer[c.FilesToTransferCurrentNum].FolderSource,
c.FilesToTransfer[c.FilesToTransferCurrentNum].Name,
)
c.fread, err = mmap.Open(pathToFile)
if err != nil {
return
}
for i := 0; i < len(c.Options.RelayPorts); i++ {
log.Debugf("starting sending over comm %d", i)
go c.sendData(i)
@ -881,6 +892,7 @@ func (c *Client) setBar() {
}
func (c *Client) receiveData(i int) {
log.Debugf("%d receiving data")
for {
data, err := c.conn[i+1].Receive()
if err != nil {
@ -939,23 +951,30 @@ func (c *Client) sendData(i int) {
defer func() {
log.Debugf("finished with %d", i)
}()
pathToFile := path.Join(
c.FilesToTransfer[c.FilesToTransferCurrentNum].FolderSource,
c.FilesToTransfer[c.FilesToTransferCurrentNum].Name,
)
log.Debugf("opening %s to read", pathToFile)
f, err := os.Open(pathToFile)
if err != nil {
panic(err)
}
defer f.Close()
// pathToFile := path.Join(
// c.FilesToTransfer[c.FilesToTransferCurrentNum].FolderSource,
// c.FilesToTransfer[c.FilesToTransferCurrentNum].Name,
// )
// log.Debugf("opening %s to read", pathToFile)
// f, err := mmap.Open(pathToFile)
// if err != nil {
// panic(err)
// }
// defer f.Close()
var readingPos int64
pos := uint64(0)
curi := float64(0)
for {
// Read file
data := make([]byte, models.TCP_BUFFER_SIZE/2)
n, err := f.Read(data)
if readingPos >= int64(c.fread.Len()) {
break
}
log.Debug("trying to read")
n, err := c.fread.ReadAt(data, readingPos)
log.Debugf("read %d bytes", n)
readingPos += int64(n)
if err != nil {
if err == io.EOF {
break
@ -989,7 +1008,9 @@ func (c *Client) sendData(i int) {
panic(err)
}
log.Debug("sending data")
err = c.conn[i+1].Send(dataToSend)
log.Debug("sent")
if err != nil {
panic(err)
}
@ -1005,6 +1026,6 @@ func (c *Client) sendData(i int) {
pos += uint64(n)
}
time.Sleep(10 * time.Second)
time.Sleep(100 * time.Millisecond)
return
}

1
src/croc/croc_test.go
View file

@ -11,6 +11,7 @@ import (
)
func TestCroc(t *testing.T) {
log.SetLevel("trace")
defer os.Remove("README.md")
go tcp.Run("debug", "8081", "8082,8083,8084,8085")
go tcp.Run("debug", "8082")