From 00dfe62033a43caadc4280b87f0af8c68679665b Mon Sep 17 00:00:00 2001 From: Zack Scholl Date: Mon, 23 Apr 2018 00:22:59 -0700 Subject: [PATCH] bug fix for allowing full input of servername --- connect.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/connect.go b/connect.go index 20ecbfdf..8a371caa 100644 --- a/connect.go +++ b/connect.go @@ -167,8 +167,10 @@ func (c *Connection) Run() error { if c.Local { c.DontEncrypt = true - c.Code = peerdiscovery.RandStringBytesMaskImprSrc(4) c.Yes = true + if c.Code == "" { + c.Code = peerdiscovery.RandStringBytesMaskImprSrc(4) + } } if c.Local && c.Server == "" { @@ -180,9 +182,7 @@ func (c *Connection) Run() error { Payload: []byte(c.Code), }) if c.IsSender { - c.Server = "localhost" go p.Discover() - } else { fmt.Print("finding local croc relay...") discovered, err := p.Discover() @@ -199,6 +199,7 @@ func (c *Connection) Run() error { } if c.Local && c.IsSender { + log.Debug("starting relay") relay := NewRelay(&AppConfig{ Debug: c.Debug, }) @@ -273,6 +274,8 @@ func (c *Connection) Run() error { } if c.Local { fmt.Fprintf(os.Stderr, "Receive with: croc --local\n") + fmt.Fprintf(os.Stderr, "or croc --local --server %s --code %s\n", GetLocalIP(), c.Code) + } else { fmt.Fprintf(os.Stderr, "Code is: %s\n", c.Code) }