diff --git a/src/api.go b/src/api.go index 285e678..1d2eb75 100644 --- a/src/api.go +++ b/src/api.go @@ -15,21 +15,29 @@ func init() { // Relay initiates a relay func (c *Croc) Relay() error { // start relay - go c.startRelay(c.TcpPorts) + go c.startRelay() // start server - return c.startServer(c.TcpPorts, c.ServerPort) + return c.startServer() } // Send will take an existing file or folder and send it through the croc relay func (c *Croc) Send(fname string, codephrase string) (err error) { // start relay for listening go func() { - go c.startRelay([]string{"27140,27141"}) - go c.startServer([]string{"27140,27141"}, "8140") + d := c + d.ServerPort = "8140" + d.TcpPorts = []string{"27140", "27141"} + go d.startRelay() + go d.startServer() + // e := c + // time.Sleep(100 * time.Millisecond) + // e.WebsocketAddress = "ws://127.0.0.1:8140" + // go e.client(0, codephrase, fname) }() - // start client + // start other client + c.WebsocketAddress = "ws://127.0.0.1:8140" return c.client(0, codephrase, fname) } diff --git a/src/relay.go b/src/relay.go index 77b3ee8..3287192 100644 --- a/src/relay.go +++ b/src/relay.go @@ -10,7 +10,8 @@ import ( "github.com/pkg/errors" ) -func (c *Croc) startRelay(ports []string) { +func (c *Croc) startRelay() { + ports := c.TcpPorts var wg sync.WaitGroup wg.Add(len(ports)) for _, port := range ports { diff --git a/src/server.go b/src/server.go index a57e302..9f111db 100644 --- a/src/server.go +++ b/src/server.go @@ -13,7 +13,7 @@ import ( ) // startServer initiates the server which listens for websocket connections -func (c *Croc) startServer(tcpPorts []string, port string) (err error) { +func (c *Croc) startServer() (err error) { // start cleanup on dangling channels go c.channelCleanup()