mirror of
https://github.com/schollz/croc.git
synced 2025-10-11 13:21:00 +02:00
reduce complexity
This commit is contained in:
parent
6202d0d932
commit
768ad9b739
1 changed files with 61 additions and 56 deletions
|
@ -479,21 +479,7 @@ func (c *Client) transfer(options TransferOptions) (err error) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *Client) processMessage(payload []byte) (done bool, err error) {
|
func (c *Client) procesMesssagePake(m message.Message) (err error) {
|
||||||
m, err := message.Decode(c.Key, payload)
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
switch m.Type {
|
|
||||||
case "finished":
|
|
||||||
err = message.Send(c.conn[0], c.Key, message.Message{
|
|
||||||
Type: "finished",
|
|
||||||
})
|
|
||||||
done = true
|
|
||||||
c.SuccessfulTransfer = true
|
|
||||||
return
|
|
||||||
case "pake":
|
|
||||||
log.Debug("received pake payload")
|
log.Debug("received pake payload")
|
||||||
// if // c.spinner.Suffix != " performing PAKE..." {
|
// if // c.spinner.Suffix != " performing PAKE..." {
|
||||||
// // c.spinner.Stop()
|
// // c.spinner.Stop()
|
||||||
|
@ -550,6 +536,25 @@ func (c *Client) processMessage(payload []byte) (done bool, err error) {
|
||||||
}
|
}
|
||||||
wg.Wait()
|
wg.Wait()
|
||||||
}
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) processMessage(payload []byte) (done bool, err error) {
|
||||||
|
m, err := message.Decode(c.Key, payload)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
switch m.Type {
|
||||||
|
case "finished":
|
||||||
|
err = message.Send(c.conn[0], c.Key, message.Message{
|
||||||
|
Type: "finished",
|
||||||
|
})
|
||||||
|
done = true
|
||||||
|
c.SuccessfulTransfer = true
|
||||||
|
return
|
||||||
|
case "pake":
|
||||||
|
err = c.procesMesssagePake(m)
|
||||||
case "salt":
|
case "salt":
|
||||||
log.Debug("received salt")
|
log.Debug("received salt")
|
||||||
if !c.Options.IsSender {
|
if !c.Options.IsSender {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue