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

reduce complexity

Browse source
This commit is contained in:
Zack Scholl 2019-09-20 09:32:32 -07:00
parent 049a4aaffc
commit 6202d0d932
1 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/croc/croc.go
View file

@ -653,7 +653,7 @@ func (c *Client) processMessage(payload []byte) (done bool, err error) {
return return
} }
func (c *Client) updateState() (err error) { func (c *Client) updateIfSenderChannelSecured() (err error) {
if c.Options.IsSender && c.Step1ChannelSecured && !c.Step2FileInfoTransfered { if c.Options.IsSender && c.Step1ChannelSecured && !c.Step2FileInfoTransfered {
var b []byte var b []byte
b, err = json.Marshal(SenderInfo{ b, err = json.Marshal(SenderInfo{
@ -673,6 +673,10 @@ func (c *Client) updateState() (err error) {
c.Step2FileInfoTransfered = true c.Step2FileInfoTransfered = true
} }
return
}
func (c *Client) updateIfRecipientHasFileInfo() (err error) {
if !c.Options.IsSender && c.Step2FileInfoTransfered && !c.Step3RecipientRequestFile { if !c.Options.IsSender && c.Step2FileInfoTransfered && !c.Step3RecipientRequestFile {
// find the next file to transfer and send that number // find the next file to transfer and send that number
// if the files are the same size, then look for missing chunks // if the files are the same size, then look for missing chunks
@ -821,6 +825,20 @@ func (c *Client) updateState() (err error) {
} }
c.Step3RecipientRequestFile = true c.Step3RecipientRequestFile = true
} }
return
}
func (c *Client) updateState() (err error) {
err = c.updateIfSenderChannelSecured()
if err != nil {
return
}
err = c.updateIfRecipientHasFileInfo()
if err != nil {
return
}
if c.Options.IsSender && c.Step3RecipientRequestFile && !c.Step4FileTransfer { if c.Options.IsSender && c.Step3RecipientRequestFile && !c.Step4FileTransfer {
log.Debug("start sending data!") log.Debug("start sending data!")
if !c.firstSend { if !c.firstSend {