schollz/croc
1
0
Fork 0
mirror of https://github.com/schollz/croc.git synced 2024-11-28 09:35:14 +03:00
Code Issues Projects Releases Wiki Activity

Need to add concurrent reading from the file

Browse Source 
Perhaps using this: https://play.golang.org/p/kyusY5Dc0W
This commit is contained in:
Zack Scholl 2017-10-20 11:20:45 -06:00
parent 9e1d7b4460
commit 7ad54dced3
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
connect.go
View File

@ -79,16 +79,21 @@ func (c *Connection) Run() error {
// check code
goodCode := true
m := strings.Split(c.Code, "-")
log.Debug(m)
numThreads, errParse := strconv.Atoi(m[0])
if len(m) < 2 {
goodCode = false
log.Debug("code too short")
} else if numThreads > MAX_NUMBER_THREADS || numThreads < 1 || (forceSingleThreaded && numThreads != 1) {
c.NumberOfConnections = MAX_NUMBER_THREADS
goodCode = false
log.Debug("incorrect number of threads")
} else if errParse != nil {
goodCode = false
log.Debug("problem parsing threads")
}
log.Debug(m)
log.Debug(goodCode)
if !goodCode {
if c.IsSender {
if forceSingleThreaded {
@ -236,7 +241,9 @@ func (c *Connection) runClient() error {
} else {
sendMessage("ok", connection)
logger.Debug("receive file")
fmt.Printf("\n\nReceiving (<-%s)..\n", sendersAddress)
if id == 0 {
fmt.Printf("\n\nReceiving (<-%s)..\n", sendersAddress)
}
c.receiveFile(id, connection)
}
}
@ -341,6 +348,7 @@ func (c *Connection) receiveFile(id int, connection net.Conn) error {
logger.Debug("waiting for file")
var receivedBytes int64
receivedFirstBytes := false
for {
if !c.Debug {
c.bars[id].Incr()
@ -357,6 +365,10 @@ func (c *Connection) receiveFile(id int, connection net.Conn) error {
}
io.CopyN(newFile, connection, BUFFERSIZE)
receivedBytes += BUFFERSIZE
if !receivedFirstBytes {
receivedFirstBytes = true
logger.Debug("Receieved first bytes!")
}
}
logger.Debug("received file")
return nil
@ -390,7 +402,7 @@ func (c *Connection) sendFile(id int, connection net.Conn) {
sendBuffer := make([]byte, BUFFERSIZE)
// open encrypted file
file, err := os.Open(c.File.Name + ".enc")
file, err := os.OpenFile(c.File.Name+".enc", os.O_RDONLY, 0755)
if err != nil {
log.Error(err)
return