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

ok

Browse source
This commit is contained in:
Zack 2024-10-12 07:05:15 -07:00
parent 917d9f16b4
commit 0fca426ffe
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/croc/croc.go
View file

@ -1496,6 +1496,7 @@ func (c *Client) processMessage(payload []byte) (done bool, err error) {
switch m.Type { switch m.Type {
case message.TypeFinished: case message.TypeFinished:
log.Tracef("message.TypeFinished")
err = message.Send(c.conn[0], c.Key, message.Message{ err = message.Send(c.conn[0], c.Key, message.Message{
Type: message.TypeFinished, Type: message.TypeFinished,
}) })
@ -1503,21 +1504,26 @@ func (c *Client) processMessage(payload []byte) (done bool, err error) {
c.SuccessfulTransfer = true c.SuccessfulTransfer = true
return return
case message.TypePAKE: case message.TypePAKE:
log.Tracef("message.TypePAKE")
err = c.processMessagePake(m) err = c.processMessagePake(m)
if err != nil { if err != nil {
err = fmt.Errorf("pake not successful: %w", err) err = fmt.Errorf("pake not successful: %w", err)
log.Debug(err) log.Debug(err)
} }
case message.TypeExternalIP: case message.TypeExternalIP:
log.Tracef("message.TypeExternalIP")
done, err = c.processExternalIP(m) done, err = c.processExternalIP(m)
case message.TypeError: case message.TypeError:
log.Tracef("message.TypeError")
// c.spinner.Stop() // c.spinner.Stop()
fmt.Print("\r") fmt.Print("\r")
err = fmt.Errorf("peer error: %s", m.Message) err = fmt.Errorf("peer error: %s", m.Message)
return true, err return true, err
case message.TypeFileInfo: case message.TypeFileInfo:
log.Tracef("message.TypeFileInfo")
done, err = c.processMessageFileInfo(m) done, err = c.processMessageFileInfo(m)
case message.TypeRecipientReady: case message.TypeRecipientReady:
log.Tracef("message.TypeRecipientReady")
var remoteFile RemoteFileRequest var remoteFile RemoteFileRequest
err = json.Unmarshal(m.Bytes, &remoteFile) err = json.Unmarshal(m.Bytes, &remoteFile)
if err != nil { if err != nil {
@ -1548,6 +1554,7 @@ func (c *Client) processMessage(payload []byte) (done bool, err error) {
} }
} }
case message.TypeCloseSender: case message.TypeCloseSender:
log.Tracef("message.TypeCloseSender")
c.bar.Finish() c.bar.Finish()
log.Debug("close-sender received...") log.Debug("close-sender received...")
c.Step4FileTransferred = false c.Step4FileTransferred = false
@ -1557,6 +1564,7 @@ func (c *Client) processMessage(payload []byte) (done bool, err error) {
Type: message.TypeCloseRecipient, Type: message.TypeCloseRecipient,
}) })
case message.TypeCloseRecipient: case message.TypeCloseRecipient:
log.Tracef("message.TypeCloseRecipient")
c.Step4FileTransferred = false c.Step4FileTransferred = false
c.Step3RecipientRequestFile = false c.Step3RecipientRequestFile = false
} }