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

Use pake key

Browse source
This commit is contained in:
Zack Scholl 2019-04-13 02:55:38 -07:00
parent 513fd34298
commit 5190c47c9f
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/croc/croc.go
View file

@ -484,7 +484,8 @@ func (c *Client) processMessage(m Message) (err error) {
// start receiving data // start receiving data
pathToFile := path.Join(c.FilesToTransfer[c.FilesToTransferCurrentNum].FolderRemote, c.FilesToTransfer[c.FilesToTransferCurrentNum].Name) pathToFile := path.Join(c.FilesToTransfer[c.FilesToTransferCurrentNum].FolderRemote, c.FilesToTransfer[c.FilesToTransferCurrentNum].Name)
c.spinner.Stop() c.spinner.Stop()
c.recvSess.ReceiveData(pathToFile, c.FilesToTransfer[c.FilesToTransferCurrentNum].Size) key, _ := c.Pake.SessionKey()
c.recvSess.ReceiveData(pathToFile, c.FilesToTransfer[c.FilesToTransferCurrentNum].Size, key)
log.Debug("sending close-sender") log.Debug("sending close-sender")
err = c.redisdb.Publish(c.nameOutChannel, Message{ err = c.redisdb.Publish(c.nameOutChannel, Message{
Type: "close-sender", Type: "close-sender",
@ -495,7 +496,8 @@ func (c *Client) processMessage(m Message) (err error) {
err = c.sendSess.SetSDP(m.Message) err = c.sendSess.SetSDP(m.Message)
pathToFile := path.Join(c.FilesToTransfer[c.FilesToTransferCurrentNum].FolderSource, c.FilesToTransfer[c.FilesToTransferCurrentNum].Name) pathToFile := path.Join(c.FilesToTransfer[c.FilesToTransferCurrentNum].FolderSource, c.FilesToTransfer[c.FilesToTransferCurrentNum].Name)
c.spinner.Stop() c.spinner.Stop()
c.sendSess.TransferFile(pathToFile) key, _ := c.Pake.SessionKey()
c.sendSess.TransferFile(pathToFile, key)
case "close-sender": case "close-sender":
log.Debug("close-sender received...") log.Debug("close-sender received...")
c.Step4FileTransfer = false c.Step4FileTransfer = false