mirror of https://github.com/schollz/croc.git
Use cowyo by default
This commit is contained in:
parent
cee7c087ba
commit
0d2afdaed1
|
@ -1,6 +1,6 @@
|
||||||
# personalportal
|
# personalportal
|
||||||
|
|
||||||
*File transfer over parallel TCP, running a rendevouz server (but you don't need to do any port-forwarding!.*
|
*File transfer over parallel TCP with a rendevous server.*
|
||||||
|
|
||||||
This program pays homage to [magic-wormhole](https://github.com/warner/magic-wormhole) except it doesn't have the rendevous server, or the transit relay, or the password-authenticated key exchange. Its not really anything like it, except that its file transfer over TCP. Here you can transfer a file using multiple TCP ports simultaneously.
|
This program pays homage to [magic-wormhole](https://github.com/warner/magic-wormhole) except it doesn't have the rendevous server, or the transit relay, or the password-authenticated key exchange. Its not really anything like it, except that its file transfer over TCP. Here you can transfer a file using multiple TCP ports simultaneously.
|
||||||
|
|
||||||
|
|
|
@ -44,12 +44,14 @@ func runClient(connectionType string, codePhrase string) {
|
||||||
logger.Debugf("telling relay: %s", connectionType+"."+codePhrase)
|
logger.Debugf("telling relay: %s", connectionType+"."+codePhrase)
|
||||||
sendMessage(connectionType+"."+codePhrase, connection)
|
sendMessage(connectionType+"."+codePhrase, connection)
|
||||||
if connectionType == "s" { // this is a sender
|
if connectionType == "s" { // this is a sender
|
||||||
|
if id == 0 {
|
||||||
|
fmt.Println("waiting for other to connect")
|
||||||
|
}
|
||||||
logger.Debug("waiting for ok from relay")
|
logger.Debug("waiting for ok from relay")
|
||||||
message = receiveMessage(connection)
|
message = receiveMessage(connection)
|
||||||
logger.Debug("got ok from relay")
|
logger.Debug("got ok from relay")
|
||||||
// wait for pipe to be made
|
// wait for pipe to be made
|
||||||
time.Sleep(100 * time.Millisecond)
|
time.Sleep(100 * time.Millisecond)
|
||||||
|
|
||||||
// Write data from file
|
// Write data from file
|
||||||
logger.Debug("send file")
|
logger.Debug("send file")
|
||||||
sendFile(id, connection)
|
sendFile(id, connection)
|
||||||
|
|
6
main.go
6
main.go
|
@ -23,7 +23,7 @@ var runAsRelay, debugFlag bool
|
||||||
func main() {
|
func main() {
|
||||||
flag.BoolVar(&runAsRelay, "relay", false, "run as relay")
|
flag.BoolVar(&runAsRelay, "relay", false, "run as relay")
|
||||||
flag.BoolVar(&debugFlag, "debug", false, "debug mode")
|
flag.BoolVar(&debugFlag, "debug", false, "debug mode")
|
||||||
flag.StringVar(&serverAddress, "server", "", "(run as client) server address to connect to")
|
flag.StringVar(&serverAddress, "server", "cowyo.com", "(run as client) server address to connect to")
|
||||||
flag.StringVar(&fileName, "file", "", "(run as server) file to serve")
|
flag.StringVar(&fileName, "file", "", "(run as server) file to serve")
|
||||||
flag.StringVar(&codePhraseFlag, "code", "", "(run as server) file to serve")
|
flag.StringVar(&codePhraseFlag, "code", "", "(run as server) file to serve")
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
|
@ -48,7 +48,9 @@ func main() {
|
||||||
|
|
||||||
if !runAsRelay {
|
if !runAsRelay {
|
||||||
if len(codePhraseFlag) == 0 {
|
if len(codePhraseFlag) == 0 {
|
||||||
codePhraseFlag = getInput("What is your code phrase? ")
|
if connectionTypeFlag == "r" {
|
||||||
|
codePhraseFlag = getInput("What is your code phrase? ")
|
||||||
|
}
|
||||||
if len(codePhraseFlag) < 5 {
|
if len(codePhraseFlag) < 5 {
|
||||||
codePhraseFlag = GetRandomName()
|
codePhraseFlag = GetRandomName()
|
||||||
fmt.Println("Your code phrase is now " + codePhraseFlag)
|
fmt.Println("Your code phrase is now " + codePhraseFlag)
|
||||||
|
|
Loading…
Reference in New Issue