schollz/croc
1
0
Fork 0
mirror of https://github.com/schollz/croc.git synced 2024-11-24 16:23:47 +03:00
Code Issues Projects Releases Wiki Activity

small fix

Browse Source
This commit is contained in:
Zack Scholl 2018-09-25 17:24:06 -07:00
parent 71fee31da0
commit c8c532c5dd
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/sender/sender.go
View File

@ -190,10 +190,6 @@ func send(forceSend int, serverAddress string, tcpPorts []string, isLocal bool,
// put number of byte read
transferBytes, err := json.Marshal(models.BytesAndLocation{Bytes: compressedBytes, Location: currentPostition})
// do encryption
enc := crypt.Encrypt(transferBytes, sessionKey, !useEncryption)
encBytes, err := json.Marshal(enc)
if err != nil {
dataChan <- DataChan{
b: nil,
@ -203,6 +199,9 @@ func send(forceSend int, serverAddress string, tcpPorts []string, isLocal bool,
return
}
// do encryption
enc := crypt.Encrypt(transferBytes, sessionKey, !useEncryption)
encBytes, err := json.Marshal(enc)
if err != nil {
dataChan <- DataChan{
b: nil,
@ -347,9 +346,8 @@ func send(forceSend int, serverAddress string, tcpPorts []string, isLocal bool,
}
} else {
for i := range tcpConnections {
go func(tcpConnection comm.Comm) {
for {
data := <-dataChan
go func(dataChan <-chan DataChan, tcpConnection comm.Comm) {
for data := range dataChan {
if data.err != nil {
log.Error(data.err)
return
@ -367,7 +365,7 @@ func send(forceSend int, serverAddress string, tcpPorts []string, isLocal bool,
}
}
}(tcpConnections[i])
}(dataChan, tcpConnections[i])
}
}