add more detail info for routing

ginuerzh · Dec 6, 2018 · 7686a4b · 7686a4b
1 parent 0bb52bc
commit 7686a4b
Show file tree

Hide file tree

Showing 26 changed files with 592 additions and 561 deletions.
diff --git a/bypass.go b/bypass.go
@@ -152,7  152,7 @@ func NewBypassPatterns(reversed bool, patterns ...string) *Bypass {
 
 // Contains reports whether the bypass includes addr.
 func (bp *Bypass) Contains(addr string) bool {
-	if bp == nil {
 	if bp == nil || addr == "" {
 		return false
 	}
 	// try to strip the port

diff --git a/chain.go b/chain.go
@@ -1,9  1,7 @@
 package gost
 
 import (
-	"bytes"
 	"errors"
-	"fmt"
 	"net"
 	"time"
 
@@ -20,6  18,7 @@ type Chain struct {
 	isRoute    bool
 	Retries    int
 	nodeGroups []*NodeGroup
 	route      []Node // nodes in the selected route
 }
 
 // NewChain creates a proxy chain with a list of proxy nodes.
@@ -197,18  196,14 @@ func (c *Chain) Conn(opts ...ChainOption) (conn net.Conn, err error) {
 			continue
 		}
 		conn, err = route.getConn()
-		if err != nil {
-			log.Log(err)
-			continue
 		if err == nil {
 			break
 		}
-
-		break
 	}
 	return
 }
 
 // getConn obtains a connection to the last node of the chain.
-// It does not handshake with the last node.
 func (c *Chain) getConn() (conn net.Conn, err error) {
 	if c.IsEmpty() {
 		err = ErrEmptyChain
@@ -256,35  251,7 @@ func (c *Chain) getConn() (conn net.Conn, err error) {
 }
 
 func (c *Chain) selectRoute() (route *Chain, err error) {
-	if c.IsEmpty() || c.isRoute {
-		return c, nil
-	}
-
-	buf := bytes.Buffer{}
-	route = newRoute()
-
-	for _, group := range c.nodeGroups {
-		node, err := group.Next()
-		if err != nil {
-			return nil, err
-		}
-		buf.WriteString(fmt.Sprintf("%s -> ", node.String()))
-
-		if node.Client.Transporter.Multiplex() {
-			node.DialOptions = append(node.DialOptions,
-				ChainDialOption(route),
-			)
-			route = newRoute() // cutoff the chain for multiplex.
-		}
-
-		route.AddNode(node)
-	}
-	route.Retries = c.Retries
-
-	if Debug {
-		log.Log("select route:", buf.String())
-	}
-	return
 	return c.selectRouteFor("")
 }
 
 // selectRouteFor selects route with bypass testing.
@@ -293,8  260,8 @@ func (c *Chain) selectRouteFor(addr string) (route *Chain, err error) {
 		return c, nil
 	}
 
-	buf := bytes.Buffer{}
 	route = newRoute()
 	var nl []Node
 
 	for _, group := range c.nodeGroups {
 		var node Node
@@ -304,28  271,21 @@ func (c *Chain) selectRouteFor(addr string) (route *Chain, err error) {
 		}
 
 		if node.Bypass.Contains(addr) {
-			if Debug {
-				buf.WriteString(fmt.Sprintf("[bypass]%s -> %s", node.String(), addr))
-				log.Log("[route]", buf.String())
-			}
-			return
 			break
 		}
 
-		buf.WriteString(fmt.Sprintf("%s -> ", node.String()))
-
 		if node.Client.Transporter.Multiplex() {
 			node.DialOptions = append(node.DialOptions,
 				ChainDialOption(route),
 			)
-			route = newRoute() // cutoff the chain for multiplex.
 			route = newRoute() // cutoff the chain for multiplex node.
 		}
 
 		route.AddNode(node)
 		nl = append(nl, node)
 	}
-	route.Retries = c.Retries
 
-	buf.WriteString(addr)
-	log.Log("[route]", buf.String())
 	route.route = nl
 
 	return
 }

diff --git a/cmd/gost/bypass.txt → cmd/gost/.config/bypass.txt b/cmd/gost/bypass.txt → cmd/gost/.config/bypass.txt
diff --git a/cmd/gost/dns.txt → cmd/gost/.config/dns.txt b/cmd/gost/dns.txt → cmd/gost/.config/dns.txt
diff --git a/cmd/gost/hosts.txt → cmd/gost/.config/hosts.txt b/cmd/gost/hosts.txt → cmd/gost/.config/hosts.txt
diff --git a/cmd/gost/peer.txt → cmd/gost/.config/peer.txt b/cmd/gost/peer.txt → cmd/gost/.config/peer.txt
diff --git a/cmd/gost/.config/probe_resist.txt b/cmd/gost/.config/probe_resist.txt
@@ -0,0  1 @@
 Hello World!
diff --git a/cmd/gost/secrets.txt → cmd/gost/.config/secrets.txt b/cmd/gost/secrets.txt → cmd/gost/.config/secrets.txt
diff --git a/cmd/gost/kcp.json b/cmd/gost/kcp.json
diff --git a/cmd/gost/route.go b/cmd/gost/route.go
@@ -407,7  407,8 @@ func (r *route) GenRouters() ([]router, error) {
 		hosts := parseHosts(node.Get("hosts"))
 
 		handler.Init(
-			gost.AddrHandlerOption(node.Addr),
 			// gost.AddrHandlerOption(node.Addr),
 			gost.AddrHandlerOption(ln.Addr().String()),
 			gost.ChainHandlerOption(chain),
 			gost.UsersHandlerOption(users...),
 			gost.TLSConfigHandlerOption(tlsCfg),
@@ -417,9  418,10 @@ func (r *route) GenRouters() ([]router, error) {
 			gost.BypassHandlerOption(node.Bypass),
 			gost.ResolverHandlerOption(resolver),
 			gost.HostsHandlerOption(hosts),
-			gost.RetryHandlerOption(node.GetInt("retry")),
 			gost.RetryHandlerOption(node.GetInt("retry")), // override the global retry option.
 			gost.TimeoutHandlerOption(time.Duration(node.GetInt("timeout"))*time.Second),
 			gost.ProbeResistHandlerOption(node.Get("probe_resist")),
 			gost.NodeHandlerOption(node),
 		)
 
 		rt := router{
@@ -446,7  448,7 @@ type router struct {
 }
 
 func (r *router) Serve() error {
-	log.Logf("[route] start %s on %s", r.node.String(), r.server.Addr())
 	log.Logf("%s on %s", r.node.String(), r.server.Addr())
 	return r.server.Serve(r.handler)
 }
 

diff --git a/cmd/gost/ssl/README.md b/cmd/gost/ssl/README.md
diff --git a/cmd/gost/ssl/localhost.crt b/cmd/gost/ssl/localhost.crt
diff --git a/cmd/gost/ssl/localhost.csr b/cmd/gost/ssl/localhost.csr
diff --git a/cmd/gost/ssl/localhost.key b/cmd/gost/ssl/localhost.key
diff --git a/cmd/gost/ssl/rootCA.crt b/cmd/gost/ssl/rootCA.crt
diff --git a/cmd/gost/ssl/rootCA.key b/cmd/gost/ssl/rootCA.key
diff --git a/cmd/gost/ssl/rootCA.srl b/cmd/gost/ssl/rootCA.srl