Tweak parent proxy connection error message.

This commit is contained in:
Chen Yufei
2013-11-22 14:24:01 +08:00
parent 091d879367
commit 4abdffcc1a

View File

@@ -137,11 +137,11 @@ func (hp *httpParent) initAuth(userPasswd string) {
func (hp *httpParent) connect(url *URL) (net.Conn, error) {
c, err := net.Dial("tcp", hp.server)
if err != nil {
errl.Printf("can't connect to http parent proxy %s for %s: %v\n",
errl.Printf("can't connect to http parent %s for %s: %v\n",
hp.server, url.HostPort, err)
return nil, err
}
debug.Printf("connected to: %s via http parent proxy: %s\n",
debug.Printf("connected to: %s via http parent: %s\n",
url.HostPort, hp.server)
return httpConn{c, hp}, nil
}
@@ -192,8 +192,8 @@ func (sp *shadowsocksParent) initCipher(method, passwd string) {
func (sp *shadowsocksParent) connect(url *URL) (net.Conn, error) {
c, err := ss.Dial(url.HostPort, sp.server, sp.cipher.Copy())
if err != nil {
errl.Printf("create shadowsocks connection to %s through server %s failed %v\n",
url.HostPort, sp.server, err)
errl.Printf("can't connect to shadowsocks parent %s for %s: %v\n",
sp.server, url.HostPort, err)
return nil, err
}
debug.Println("connected to:", url.HostPort, "via shadowsocks:", sp.server)
@@ -230,11 +230,11 @@ func (cp *cowParent) genConfig() string {
func (cp *cowParent) connect(url *URL) (net.Conn, error) {
c, err := net.Dial("tcp", cp.server)
if err != nil {
errl.Printf("can't connect to cow parent proxy %s for %s: %v\n",
errl.Printf("can't connect to cow parent %s for %s: %v\n",
cp.server, url.HostPort, err)
return nil, err
}
debug.Printf("connected to: %s via cow parent proxy: %s\n",
debug.Printf("connected to: %s via cow parent: %s\n",
url.HostPort, cp.server)
ssconn := ss.NewConn(c, cp.cipher.Copy())
return cowConn{ssconn, cp}, nil
@@ -287,7 +287,7 @@ func (sp *socksParent) genConfig() string {
func (sp *socksParent) connect(url *URL) (net.Conn, error) {
c, err := net.Dial("tcp", sp.server)
if err != nil {
errl.Printf("can't connect to socks server %s for %s: %v\n",
errl.Printf("can't connect to socks parent %s for %s: %v\n",
sp.server, url.HostPort, err)
return nil, err
}
@@ -356,7 +356,7 @@ func (sp *socksParent) connect(url *URL) (net.Conn, error) {
errl.Printf("read socks reply err %v n %d\n", err, n)
}
hasErr = true
return nil, errors.New("Connection failed (by socks server). No such host?")
return nil, errors.New("connection failed (by socks server " + sp.server + "). No such host?")
}
// debug.Printf("Socks reply length %d\n", n)