From 0d2afdaed12f53301ef722c1175817f22f310021 Mon Sep 17 00:00:00 2001
From: Zack Scholl <zack.scholl@gmail.com>
Date: Tue, 17 Oct 2017 19:06:59 -0600
Subject: [PATCH] Use cowyo by default

---
 README.md  | 2 +-
 connect.go | 4 +++-
 main.go    | 6 ++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 3c63582..300dafa 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # 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. 
 
diff --git a/connect.go b/connect.go
index 5567595..486f41c 100644
--- a/connect.go
+++ b/connect.go
@@ -44,12 +44,14 @@ func runClient(connectionType string, codePhrase string) {
 			logger.Debugf("telling relay: %s", connectionType+"."+codePhrase)
 			sendMessage(connectionType+"."+codePhrase, connection)
 			if connectionType == "s" { // this is a sender
+				if id == 0 {
+					fmt.Println("waiting for other to connect")
+				}
 				logger.Debug("waiting for ok from relay")
 				message = receiveMessage(connection)
 				logger.Debug("got ok from relay")
 				// wait for pipe to be made
 				time.Sleep(100 * time.Millisecond)
-
 				// Write data from file
 				logger.Debug("send file")
 				sendFile(id, connection)
diff --git a/main.go b/main.go
index b8172d6..56a3bfa 100644
--- a/main.go
+++ b/main.go
@@ -23,7 +23,7 @@ var runAsRelay, debugFlag bool
 func main() {
 	flag.BoolVar(&runAsRelay, "relay", false, "run as relay")
 	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(&codePhraseFlag, "code", "", "(run as server) file to serve")
 	flag.Parse()
@@ -48,7 +48,9 @@ func main() {
 
 	if !runAsRelay {
 		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 {
 				codePhraseFlag = GetRandomName()
 				fmt.Println("Your code phrase is now " + codePhraseFlag)