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

Merge pull request #435 from AmeyShrivastava/fix-typos

Browse Source 
Fix Typos
This commit is contained in:
Zack 2021-11-17 10:52:29 -08:00 committed by GitHub
commit f210ef8877
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cli/cli.go
View File

@ -460,7 +460,7 @@ func receive(c *cli.Context) (err error) {
log.Error(err) log.Error(err)
return return
} }
// update anything that isn't expliciGlobalIsSettly set // update anything that isn't explicitly Globally set
if !c.IsSet("relay") && rememberedOptions.RelayAddress != "" { if !c.IsSet("relay") && rememberedOptions.RelayAddress != "" {
crocOptions.RelayAddress = rememberedOptions.RelayAddress crocOptions.RelayAddress = rememberedOptions.RelayAddress
} }

28
src/croc/croc.go
View File

@ -85,7 +85,7 @@ type Client struct {
// steps involved in forming relationship // steps involved in forming relationship
Step1ChannelSecured bool Step1ChannelSecured bool
Step2FileInfoTransfered bool Step2FileInfoTransferred bool
Step3RecipientRequestFile bool Step3RecipientRequestFile bool
Step4FileTransfer bool Step4FileTransfer bool
Step5CloseChannels bool Step5CloseChannels bool
@ -104,7 +104,7 @@ type Client struct {
LastFolder string LastFolder string
TotalSent int64 TotalSent int64
TotalChunksTransfered int TotalChunksTransferred int
chunkMap map[uint64]struct{} chunkMap map[uint64]struct{}
limiter *rate.Limiter limiter *rate.Limiter
@ -120,7 +120,7 @@ type Client struct {
numfinished int numfinished int
quit chan bool quit chan bool
finishedNum int finishedNum int
numberOfTransferedFiles int numberOfTransferredFiles int
} }
// Chunk contains information about the // Chunk contains information about the
@ -612,7 +612,7 @@ func (c *Client) Receive() (err error) {
address := net.JoinHostPort(discoveries[i].Address, portToUse) address := net.JoinHostPort(discoveries[i].Address, portToUse)
errPing := tcp.PingServer(address) errPing := tcp.PingServer(address)
if errPing == nil { if errPing == nil {
log.Debugf("succesfully pinged '%s'", address) log.Debugf("successfully pinged '%s'", address)
c.Options.RelayAddress = address c.Options.RelayAddress = address
c.ExternalIPConnected = c.Options.RelayAddress c.ExternalIPConnected = c.Options.RelayAddress
c.Options.RelayAddress6 = "" c.Options.RelayAddress6 = ""
@ -728,7 +728,7 @@ func (c *Client) Receive() (err error) {
fmt.Fprintf(os.Stderr, "\rsecuring channel...") fmt.Fprintf(os.Stderr, "\rsecuring channel...")
err = c.transfer(TransferOptions{}) err = c.transfer(TransferOptions{})
if err == nil { if err == nil {
if c.numberOfTransferedFiles == 0 { if c.numberOfTransferredFiles == 0 {
fmt.Fprintf(os.Stderr, "\rNo files transferred.") fmt.Fprintf(os.Stderr, "\rNo files transferred.")
} }
} }
@ -878,7 +878,7 @@ func (c *Client) processMessageFileInfo(m message.Message) (done bool, err error
fmt.Fprintf(os.Stderr, "\nReceiving (<-%s)\n", c.ExternalIPConnected) fmt.Fprintf(os.Stderr, "\nReceiving (<-%s)\n", c.ExternalIPConnected)
log.Debug(c.FilesToTransfer) log.Debug(c.FilesToTransfer)
c.Step2FileInfoTransfered = true c.Step2FileInfoTransferred = true
return return
} }
@ -1094,7 +1094,7 @@ func (c *Client) processMessage(payload []byte) (done bool, err error) {
} }
func (c *Client) updateIfSenderChannelSecured() (err error) { func (c *Client) updateIfSenderChannelSecured() (err error) {
if c.Options.IsSender && c.Step1ChannelSecured && !c.Step2FileInfoTransfered { if c.Options.IsSender && c.Step1ChannelSecured && !c.Step2FileInfoTransferred {
var b []byte var b []byte
machID, _ := machineid.ID() machID, _ := machineid.ID()
b, err = json.Marshal(SenderInfo{ b, err = json.Marshal(SenderInfo{
@ -1117,7 +1117,7 @@ func (c *Client) updateIfSenderChannelSecured() (err error) {
return return
} }
c.Step2FileInfoTransfered = true c.Step2FileInfoTransferred = true
} }
return return
} }
@ -1278,7 +1278,7 @@ func (c *Client) createEmptyFileAndFinish(fileInfo FileInfo, i int) (err error)
} }
func (c *Client) updateIfRecipientHasFileInfo() (err error) { func (c *Client) updateIfRecipientHasFileInfo() (err error) {
if !(!c.Options.IsSender && c.Step2FileInfoTransfered && !c.Step3RecipientRequestFile) { if !(!c.Options.IsSender && c.Step2FileInfoTransferred && !c.Step3RecipientRequestFile) {
return return
} }
// find the next file to transfer and send that number // find the next file to transfer and send that number
@ -1305,7 +1305,7 @@ func (c *Client) updateIfRecipientHasFileInfo() (err error) {
if err != nil { if err != nil {
return return
} else { } else {
c.numberOfTransferedFiles++ c.numberOfTransferredFiles++
} }
continue continue
} }
@ -1343,7 +1343,7 @@ func (c *Client) updateIfRecipientHasFileInfo() (err error) {
if errHash != nil || !bytes.Equal(fileHash, fileInfo.Hash) { if errHash != nil || !bytes.Equal(fileHash, fileInfo.Hash) {
finished = false finished = false
c.FilesToTransferCurrentNum = i c.FilesToTransferCurrentNum = i
c.numberOfTransferedFiles++ c.numberOfTransferredFiles++
newFolder, _ := filepath.Split(fileInfo.FolderRemote) newFolder, _ := filepath.Split(fileInfo.FolderRemote)
if newFolder != c.LastFolder && len(c.FilesToTransfer) > 0 { if newFolder != c.LastFolder && len(c.FilesToTransfer) > 0 {
fmt.Fprintf(os.Stderr, "\r%s\n", newFolder) fmt.Fprintf(os.Stderr, "\r%s\n", newFolder)
@ -1501,10 +1501,10 @@ func (c *Client) receiveData(i int) {
} }
c.bar.Add(len(data[8:])) c.bar.Add(len(data[8:]))
c.TotalSent += int64(len(data[8:])) c.TotalSent += int64(len(data[8:]))
c.TotalChunksTransfered++ c.TotalChunksTransferred++
// log.Debug(len(c.CurrentFileChunks), c.TotalChunksTransfered, c.TotalSent, c.FilesToTransfer[c.FilesToTransferCurrentNum].Size) // log.Debug(len(c.CurrentFileChunks), c.TotalChunksTransferred, c.TotalSent, c.FilesToTransfer[c.FilesToTransferCurrentNum].Size)
if !c.CurrentFileIsClosed && (c.TotalChunksTransfered == len(c.CurrentFileChunks) || c.TotalSent == c.FilesToTransfer[c.FilesToTransferCurrentNum].Size) { if !c.CurrentFileIsClosed && (c.TotalChunksTransferred == len(c.CurrentFileChunks) || c.TotalSent == c.FilesToTransfer[c.FilesToTransferCurrentNum].Size) {
c.CurrentFileIsClosed = true c.CurrentFileIsClosed = true
log.Debug("finished receiving!") log.Debug("finished receiving!")
if err := c.CurrentFile.Close(); err != nil { if err := c.CurrentFile.Close(); err != nil {

6
src/install/default.txt
View File

@ -159,7 +159,7 @@ make_tempdir() {
# DESCRIPTION: Attempts to determin host os using uname # DESCRIPTION: Attempts to determin host os using uname
# PARAMETERS: none # PARAMETERS: none
# RETURNS: 0 = OS Detected. Also prints detected os to stdout # RETURNS: 0 = OS Detected. Also prints detected os to stdout
# 1 = Unkown OS # 1 = Unknown OS
# 20 = 'uname' not found in path # 20 = 'uname' not found in path
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
determine_os() { determine_os() {
@ -183,7 +183,7 @@ determine_os() {
# DESCRIPTION: Attempt to determin architecture of host # DESCRIPTION: Attempt to determin architecture of host
# PARAMETERS: none # PARAMETERS: none
# RETURNS: 0 = Arch Detected. Also prints detected arch to stdout # RETURNS: 0 = Arch Detected. Also prints detected arch to stdout
# 1 = Unkown arch # 1 = Unknown arch
# 20 = 'uname' not found in path # 20 = 'uname' not found in path
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
determine_arch() { determine_arch() {
@ -238,7 +238,7 @@ download_file() {
#--- FUNCTION ---------------------------------------------------------------- #--- FUNCTION ----------------------------------------------------------------
# NAME: checksum_check # NAME: checksum_check
# DESCRIPTION: Attempt to verify checksum of downloaded file to ensure # DESCRIPTION: Attempt to verify checksum of downloaded file to ensure
# integrity. Tries multiple tools before faling. # integrity. Tries multiple tools before failing.
# PARAMETERS: $1 = path to checksum file # PARAMETERS: $1 = path to checksum file
# $2 = location of file to check # $2 = location of file to check
# $3 = working directory # $3 = working directory

2
src/utils/utils.go
View File

@ -171,7 +171,7 @@ func GenerateRandomPin() string {
return s return s
} }
// GetRandomName returns mnemoicoded random name // GetRandomName returns mnemonicoded random name
func GetRandomName() string { func GetRandomName() string {
var result []string var result []string
bs := make([]byte, 4) bs := make([]byte, 4)