Robot
/
croc
mirror of https://github.com/schollz/croc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

parse url

This commit is contained in:
Zack Scholl 2020-10-08 11:06:04 -07:00
parent bd60f76519
commit 10de575f60
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/comm/comm.go
View File

@ -6,6 +6,7 @@ import (
"fmt"
"io"
"net"
"net/url"
"time"
"github.com/schollz/croc/v8/src/utils"
@ -34,13 +35,26 @@ func NewConnection(address string, timelimit ...time.Duration) (c *Comm, err err
var dialer proxy.Dialer
dialer, err = proxy.SOCKS5("tcp", Socks5Proxy, nil, proxy.Direct)
if err != nil {
err = fmt.Errorf("proxy failed: %w", err)
err = fmt.Errorf("socks5 proxy failed: %w", err)
return
}
connection, err = dialer.Dial("tcp", address)
} else if HTTPProxy != "" && !utils.IsLocalIP(address) {
var u *url.URL
u, err = url.Parse(address)
if err != nil {
u, err = url.Parse("http://" + address)
if err != nil {
return
}
}
var dialer proxy.Dialer
dialer, err = proxy.FromURL(nil, proxy.Direct)
dialer, err = proxy.FromURL(u, proxy.Direct)
if err != nil {
err = fmt.Errorf("http proxy failed: %w", err)
return
}
connection, err = dialer.Dial("tcp", address)
} else {
connection, err = net.DialTimeout("tcp", address, tlimit)
}