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

more debug

Browse source
This commit is contained in:
Zack Scholl 2018-10-09 19:47:52 -07:00
parent 9d2f07f478
commit d1e1694631
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/comm/comm.go
View file

@ -18,7 +18,7 @@ type Comm struct {
func New(c net.Conn) Comm { func New(c net.Conn) Comm {
c.SetReadDeadline(time.Now().Add(3 * time.Hour)) c.SetReadDeadline(time.Now().Add(3 * time.Hour))
c.SetDeadline(time.Now().Add(3 * time.Hour)) c.SetDeadline(time.Now().Add(3 * time.Hour))
c.SetWriteDeadline(time.Now().Add(20 * time.Second)) c.SetWriteDeadline(time.Now().Add(3 * time.Hour))
return Comm{c} return Comm{c}
} }

8
src/croc/sending.go
View file

@ -45,13 +45,14 @@ func (c *Croc) Send(fname, codephrase string) (err error) {
// broadcast for peer discovery // broadcast for peer discovery
go func() { go func() {
log.Debug("starting local croc relay...") log.Debug("starting local discovery...")
go peerdiscovery.Discover(peerdiscovery.Settings{ discovered, err := peerdiscovery.Discover(peerdiscovery.Settings{
Limit: 1, Limit: 1,
TimeLimit: 600 * time.Second, TimeLimit: 600 * time.Second,
Delay: 50 * time.Millisecond, Delay: 50 * time.Millisecond,
Payload: []byte(c.RelayWebsocketPort + "- " + strings.Join(c.RelayTCPPorts, ",")), Payload: []byte(c.RelayWebsocketPort + "- " + strings.Join(c.RelayTCPPorts, ",")),
}) })
log.Debug(discovered, err)
}() }()
// connect to own relay // connect to own relay
@ -76,6 +77,7 @@ func (c *Croc) Receive(codephrase string) (err error) {
// use local relay first // use local relay first
if !c.NoLocal { if !c.NoLocal {
log.Debug("trying discovering")
// try to discovery codephrase and server through peer network // try to discovery codephrase and server through peer network
discovered, errDiscover := peerdiscovery.Discover(peerdiscovery.Settings{ discovered, errDiscover := peerdiscovery.Discover(peerdiscovery.Settings{
Limit: 1, Limit: 1,
@ -85,6 +87,8 @@ func (c *Croc) Receive(codephrase string) (err error) {
AllowSelf: true, AllowSelf: true,
DisableBroadcast: true, DisableBroadcast: true,
}) })
log.Debug("finished")
log.Debug(discovered)
if errDiscover != nil { if errDiscover != nil {
log.Debug(errDiscover) log.Debug(errDiscover)
} }

6
src/recipient/recipient.go
View file

@ -318,11 +318,11 @@ func receive(forceSend int, serverAddress string, tcpPorts []string, isLocal boo
} }
n, err = f.WriteAt(decrypted, int64(locationToWrite)) n, err = f.WriteAt(decrypted, int64(locationToWrite))
fProgress.WriteString(fmt.Sprintf("%d\n", locationToWrite)) fProgress.WriteString(fmt.Sprintf("%d\n", locationToWrite))
log.Debugf("writing to location %d (%2.0f/%2.0f)", locationToWrite, blocksWritten, blocksToWrite) log.Debugf("wrote %d bytes to location %d (%2.0f/%2.0f)", n, locationToWrite, blocksWritten, blocksToWrite)
} else { } else {
// write to file // write to file
n, err = f.Write(decrypted) n, err = f.Write(decrypted)
log.Debugf("writing to location %d (%2.0f/%2.0f)", bytesWritten, blocksWritten, blocksToWrite) log.Debugf("wrote %d bytes to location %d (%2.0f/%2.0f)", n, bytesWritten, blocksWritten, blocksToWrite)
fProgress.WriteString(fmt.Sprintf("%d\n", bytesWritten)) fProgress.WriteString(fmt.Sprintf("%d\n", bytesWritten))
} }
if err != nil { if err != nil {
@ -336,7 +336,7 @@ func receive(forceSend int, serverAddress string, tcpPorts []string, isLocal boo
// update the progress bar // update the progress bar
bar.Add(n) bar.Add(n)
if int64(bytesWritten) == fstats.Size || blocksWritten >= blocksToWrite { if int64(bytesWritten) == fstats.Size || blocksWritten >= blocksToWrite {
log.Debug("finished") log.Debug("finished", int64(bytesWritten), fstats.Size, blocksWritten, blocksToWrite)
break break
} }
} }