mirror of https://github.com/schollz/croc.git
try fix
This commit is contained in:
parent
c0e9d478e7
commit
73d8eadce4
|
@ -3,7 +3,6 @@ package recipient
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"net"
|
"net"
|
||||||
|
@ -14,6 +13,7 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
humanize "github.com/dustin/go-humanize"
|
humanize "github.com/dustin/go-humanize"
|
||||||
|
"github.com/pkg/errors"
|
||||||
|
|
||||||
log "github.com/cihub/seelog"
|
log "github.com/cihub/seelog"
|
||||||
"github.com/gorilla/websocket"
|
"github.com/gorilla/websocket"
|
||||||
|
@ -407,10 +407,15 @@ func receive(forceSend int, serverAddress string, tcpPorts []string, isLocal boo
|
||||||
|
|
||||||
func connectToTCPServer(room string, address string) (com *comm.Comm, err error) {
|
func connectToTCPServer(room string, address string) (com *comm.Comm, err error) {
|
||||||
log.Debugf("recipient connecting to %s", address)
|
log.Debugf("recipient connecting to %s", address)
|
||||||
connection, err := net.Dial("tcp", address)
|
rAddr, err := net.ResolveTCPAddr("tcp", address)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
connection, err := net.DialTCP("tcp", nil, rAddr)
|
||||||
|
if err != nil {
|
||||||
|
err = errors.Wrap(err, "bad connection to tcp")
|
||||||
|
return
|
||||||
|
}
|
||||||
connection.SetReadDeadline(time.Now().Add(3 * time.Hour))
|
connection.SetReadDeadline(time.Now().Add(3 * time.Hour))
|
||||||
connection.SetDeadline(time.Now().Add(3 * time.Hour))
|
connection.SetDeadline(time.Now().Add(3 * time.Hour))
|
||||||
connection.SetWriteDeadline(time.Now().Add(3 * time.Hour))
|
connection.SetWriteDeadline(time.Now().Add(3 * time.Hour))
|
||||||
|
|
|
@ -408,10 +408,15 @@ func send(forceSend int, serverAddress string, tcpPorts []string, isLocal bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
func connectToTCPServer(room string, address string) (com *comm.Comm, err error) {
|
func connectToTCPServer(room string, address string) (com *comm.Comm, err error) {
|
||||||
connection, err := net.Dial("tcp", address)
|
rAddr, err := net.ResolveTCPAddr("tcp", address)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
connection, err := net.DialTCP("tcp", nil, rAddr)
|
||||||
|
if err != nil {
|
||||||
|
err = errors.Wrap(err, "bad connection to tcp")
|
||||||
|
return
|
||||||
|
}
|
||||||
connection.SetReadDeadline(time.Now().Add(3 * time.Hour))
|
connection.SetReadDeadline(time.Now().Add(3 * time.Hour))
|
||||||
connection.SetDeadline(time.Now().Add(3 * time.Hour))
|
connection.SetDeadline(time.Now().Add(3 * time.Hour))
|
||||||
connection.SetWriteDeadline(time.Now().Add(3 * time.Hour))
|
connection.SetWriteDeadline(time.Now().Add(3 * time.Hour))
|
||||||
|
|
|
@ -42,7 +42,7 @@ func Run(debugLevel, port string) {
|
||||||
|
|
||||||
func run(port string) (err error) {
|
func run(port string) (err error) {
|
||||||
log.Debugf("starting TCP server on " + port)
|
log.Debugf("starting TCP server on " + port)
|
||||||
rAddr, err := net.ResolveTCPAddr("tcp", "localhost:"+port)
|
rAddr, err := net.ResolveTCPAddr("tcp", "0.0.0.0:"+port)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue