Skip to content

G
gost
Commit a9c28789 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' of github.com:ginuerzh/gost

parents 7b8ca674 0247b941
Pipeline #13059 canceled with stages
        in 1 minute and 14 seconds
        Hide whitespace changes
        Inline Side-by-side
        Showing with 50 additions and 19 deletions
        chain.go
        View file @ a9c28789
        ...@@ -3,6 +3,7 @@ package gost ...@@ -3,6 +3,7 @@ package gost
        import ( import (
        "context" "context"
        "errors" "errors"
        "fmt"
        "net" "net"
        "syscall" "syscall"
        "time" "time"
        ...@@ -38,11 +39,21 @@ func NewChain(nodes ...Node) *Chain { ...@@ -38,11 +39,21 @@ func NewChain(nodes ...Node) *Chain {
        // newRoute creates a chain route. // newRoute creates a chain route.
        // a chain route is the final route after node selection. // a chain route is the final route after node selection.
        func (c *Chain) newRoute(nodes ...Node) *Chain { func (c *Chain) newRoute(nodes ...Node) *Chain {
        <<<<<<< HEAD
        chain := NewChain(nodes...) chain := NewChain(nodes...)
        chain.isRoute = true chain.isRoute = true
        chain.Interface = c.Interface chain.Interface = c.Interface
        chain.Mark = c.Mark chain.Mark = c.Mark
        return chain return chain
        =======
        route := NewChain(nodes...)
        route.isRoute = true
        if !c.IsEmpty() {
        route.Interface = c.Interface
        route.Mark = c.Mark
        }
        return route
        >>>>>>> 0247b941ac31344f0d7b3c547941a051188ba202
        } }
        // Nodes returns the proxy nodes that the chain holds. // Nodes returns the proxy nodes that the chain holds.
        ...@@ -140,6 +151,9 @@ func (c *Chain) dialWithOptions(ctx context.Context, network, address string, op ...@@ -140,6 +151,9 @@ func (c *Chain) dialWithOptions(ctx context.Context, network, address string, op
        if options == nil { if options == nil {
        options = &ChainOptions{} options = &ChainOptions{}
        } }
        if c == nil {
        c = &Chain{}
        }
        route, err := c.selectRouteFor(address) route, err := c.selectRouteFor(address)
        if err != nil { if err != nil {
        return nil, err return nil, err
        ...@@ -149,6 +163,9 @@ func (c *Chain) dialWithOptions(ctx context.Context, network, address string, op ...@@ -149,6 +163,9 @@ func (c *Chain) dialWithOptions(ctx context.Context, network, address string, op
        if address != "" { if address != "" {
        ipAddr = c.resolve(address, options.Resolver, options.Hosts) ipAddr = c.resolve(address, options.Resolver, options.Hosts)
        } }
        if ipAddr == "" {
        return nil, fmt.Errorf("resolver: domain %s does not exists", address)
        }
        timeout := options.Timeout timeout := options.Timeout
        if timeout <= 0 { if timeout <= 0 {
        ...@@ -225,9 +242,11 @@ func (*Chain) resolve(addr string, resolver Resolver, hosts *Hosts) string { ...@@ -225,9 +242,11 @@ func (*Chain) resolve(addr string, resolver Resolver, hosts *Hosts) string {
        if err != nil { if err != nil {
        log.Logf("[resolver] %s: %v", host, err) log.Logf("[resolver] %s: %v", host, err)
        } }
        if len(ips) > 0 { if len(ips) == 0 {
        return net.JoinHostPort(ips[0].String(), port) log.Logf("[resolver] %s: domain does not exists", host)
        return ""
        } }
        return net.JoinHostPort(ips[0].String(), port)
        } }
        return addr return addr
        } }
        ......
        go.mod
        View file @ a9c28789
        ...@@ -10,13 +10,13 @@ require ( ...@@ -10,13 +10,13 @@ require (
        github.com/go-gost/gosocks4 v0.0.1 github.com/go-gost/gosocks4 v0.0.1
        github.com/go-gost/gosocks5 v0.3.0 github.com/go-gost/gosocks5 v0.3.0
        github.com/go-gost/relay v0.1.1-0.20211123134818-8ef7fd81ffd7 github.com/go-gost/relay v0.1.1-0.20211123134818-8ef7fd81ffd7
        github.com/go-gost/tls-dissector v0.0.2-0.20211125135007-2b5d5bd9c07e github.com/go-gost/tls-dissector v0.0.2-0.20220408131628-aac992c27451
        github.com/go-log/log v0.2.0 github.com/go-log/log v0.2.0
        github.com/gobwas/glob v0.2.3 github.com/gobwas/glob v0.2.3
        github.com/gorilla/websocket v1.4.2 github.com/gorilla/websocket v1.4.2
        github.com/klauspost/compress v1.13.6 github.com/klauspost/compress v1.13.6
        github.com/lucas-clemente/quic-go v0.26.0 github.com/lucas-clemente/quic-go v0.26.0
        github.com/miekg/dns v1.1.43 github.com/miekg/dns v1.1.47
        github.com/milosgajdos/tenus v0.0.3 github.com/milosgajdos/tenus v0.0.3
        github.com/ryanuber/go-glob v1.0.0 github.com/ryanuber/go-glob v1.0.0
        github.com/shadowsocks/go-shadowsocks2 v0.1.5 github.com/shadowsocks/go-shadowsocks2 v0.1.5
        ......
        go.sum
        View file @ a9c28789
        ...@@ -58,8 +58,8 @@ github.com/go-gost/gosocks5 v0.3.0 h1:Hkmp9YDRBSCJd7xywW6dBPT6B9aQTkuWd+3WCheJiJ ...@@ -58,8 +58,8 @@ github.com/go-gost/gosocks5 v0.3.0 h1:Hkmp9YDRBSCJd7xywW6dBPT6B9aQTkuWd+3WCheJiJ
        github.com/go-gost/gosocks5 v0.3.0/go.mod h1:1G6I7HP7VFVxveGkoK8mnprnJqSqJjdcASKsdUn4Pp4= github.com/go-gost/gosocks5 v0.3.0/go.mod h1:1G6I7HP7VFVxveGkoK8mnprnJqSqJjdcASKsdUn4Pp4=
        github.com/go-gost/relay v0.1.1-0.20211123134818-8ef7fd81ffd7 h1:itaaJhQJ19kUXEB4Igb0EbY8m+1Py2AaNNSBds/9gk4= github.com/go-gost/relay v0.1.1-0.20211123134818-8ef7fd81ffd7 h1:itaaJhQJ19kUXEB4Igb0EbY8m+1Py2AaNNSBds/9gk4=
        github.com/go-gost/relay v0.1.1-0.20211123134818-8ef7fd81ffd7/go.mod h1:lcX+23LCQ3khIeASBo+tJ/WbwXFO32/N5YN6ucuYTG8= github.com/go-gost/relay v0.1.1-0.20211123134818-8ef7fd81ffd7/go.mod h1:lcX+23LCQ3khIeASBo+tJ/WbwXFO32/N5YN6ucuYTG8=
        github.com/go-gost/tls-dissector v0.0.2-0.20211125135007-2b5d5bd9c07e h1:73NGqAs22ey3wJkIYVD/ACEoovuIuOlEzQTEoqrO5+U= github.com/go-gost/tls-dissector v0.0.2-0.20220408131628-aac992c27451 h1:xj8gUZGYO3nb5+6Bjw9+tsFkA9sYynrOvDvvC4uDV2I=
        github.com/go-gost/tls-dissector v0.0.2-0.20211125135007-2b5d5bd9c07e/go.mod h1:/9QfdewqmHdaE362Hv5nDaSWLx3pCmtD870d6GaquXs= github.com/go-gost/tls-dissector v0.0.2-0.20220408131628-aac992c27451/go.mod h1:/9QfdewqmHdaE362Hv5nDaSWLx3pCmtD870d6GaquXs=
        github.com/go-log/log v0.2.0 h1:z8i91GBudxD5L3RmF0KVpetCbcGWAV7q1Tw1eRwQM9Q= github.com/go-log/log v0.2.0 h1:z8i91GBudxD5L3RmF0KVpetCbcGWAV7q1Tw1eRwQM9Q=
        github.com/go-log/log v0.2.0/go.mod h1:xzCnwajcues/6w7lne3yK2QU7DBPW7kqbgPGG5AF65U= github.com/go-log/log v0.2.0/go.mod h1:xzCnwajcues/6w7lne3yK2QU7DBPW7kqbgPGG5AF65U=
        github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=
        ...@@ -141,8 +141,8 @@ github.com/marten-seemann/qtls-go1-18 v0.1.1 h1:qp7p7XXUFL7fpBvSS1sWD+uSqPvzNQK4 ...@@ -141,8 +141,8 @@ github.com/marten-seemann/qtls-go1-18 v0.1.1 h1:qp7p7XXUFL7fpBvSS1sWD+uSqPvzNQK4
        github.com/marten-seemann/qtls-go1-18 v0.1.1/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4= github.com/marten-seemann/qtls-go1-18 v0.1.1/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
        github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
        github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4= github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4=
        github.com/miekg/dns v1.1.43 h1:JKfpVSCB84vrAmHzyrsxB5NAr5kLoMXZArPSw7Qlgyg= github.com/miekg/dns v1.1.47 h1:J9bWiXbqMbnZPcY8Qi2E3EWIBsIm6MZzzJB9VRg5gL8=
        github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4= github.com/miekg/dns v1.1.47/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
        github.com/milosgajdos/tenus v0.0.3 h1:jmaJzwaY1DUyYVD0lM4U+uvP2kkEg1VahDqRFxIkVBE= github.com/milosgajdos/tenus v0.0.3 h1:jmaJzwaY1DUyYVD0lM4U+uvP2kkEg1VahDqRFxIkVBE=
        github.com/milosgajdos/tenus v0.0.3/go.mod h1:eIjx29vNeDOYWJuCnaHY2r4fq5egetV26ry3on7p8qY= github.com/milosgajdos/tenus v0.0.3/go.mod h1:eIjx29vNeDOYWJuCnaHY2r4fq5egetV26ry3on7p8qY=
        github.com/mmcloughlin/avo v0.0.0-20200803215136-443f81d77104/go.mod h1:wqKykBG2QzQDJEzvRkcS8x6MiSJkF52hXZsXcjaB3ls= github.com/mmcloughlin/avo v0.0.0-20200803215136-443f81d77104/go.mod h1:wqKykBG2QzQDJEzvRkcS8x6MiSJkF52hXZsXcjaB3ls=
        ...@@ -297,6 +297,7 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY ...@@ -297,6 +297,7 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
        golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
        golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
        golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
        golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
        golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
        golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
        golang.org/x/net v0.0.0-20220325170049-de3da57026de h1:pZB1TWnKi+o4bENlbzAgLrEbY4RMYmUIRobMcSmfeYc= golang.org/x/net v0.0.0-20220325170049-de3da57026de h1:pZB1TWnKi+o4bENlbzAgLrEbY4RMYmUIRobMcSmfeYc=
        ...@@ -334,7 +335,6 @@ golang.org/x/sys v0.0.0-20200808120158-1030fc2bf1d9/go.mod h1:h1NjWce9XRLGQEsW7w ...@@ -334,7 +335,6 @@ golang.org/x/sys v0.0.0-20200808120158-1030fc2bf1d9/go.mod h1:h1NjWce9XRLGQEsW7w
        golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
        golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
        golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
        golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
        golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
        golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
        golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
        ...@@ -371,6 +371,7 @@ golang.org/x/tools v0.0.0-20200425043458-8463f397d07c/go.mod h1:EkVYQZoAsY45+roY ...@@ -371,6 +371,7 @@ golang.org/x/tools v0.0.0-20200425043458-8463f397d07c/go.mod h1:EkVYQZoAsY45+roY
        golang.org/x/tools v0.0.0-20200808161706-5bf02b21f123/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200808161706-5bf02b21f123/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
        golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
        golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
        golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
        golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20= golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20=
        golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
        golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
        ......
        resolver.go
        View file @ a9c28789
        ...@@ -263,9 +263,7 @@ func (r *resolver) copyServers() []NameServer { ...@@ -263,9 +263,7 @@ func (r *resolver) copyServers() []NameServer {
        defer r.mux.RUnlock() defer r.mux.RUnlock()
        servers := make([]NameServer, len(r.servers)) servers := make([]NameServer, len(r.servers))
        for i := range r.servers { copy(servers, r.servers)
        servers[i] = r.servers[i]
        }
        return servers return servers
        } }
        ...@@ -312,17 +310,28 @@ func (r *resolver) resolve(ctx context.Context, ex Exchanger, host string) (ips ...@@ -312,17 +310,28 @@ func (r *resolver) resolve(ctx context.Context, ex Exchanger, host string) (ips
        r.mux.RUnlock() r.mux.RUnlock()
        if prefer == "ipv6" { // prefer ipv6 if prefer == "ipv6" { // prefer ipv6
        mq := &dns.Msg{} if ips, err = r.resolve6(ctx, ex, host); len(ips) > 0 {
        mq.SetQuestion(dns.Fqdn(host), dns.TypeAAAA)
        ips, err = r.resolveIPs(ctx, ex, mq)
        if err != nil || len(ips) > 0 {
        return return
        } }
        return r.resolve4(ctx, ex, host)
        } }
        mq := &dns.Msg{} if ips, err = r.resolve4(ctx, ex, host); len(ips) > 0 {
        return
        }
        return r.resolve6(ctx, ex, host)
        }
        func (r *resolver) resolve4(ctx context.Context, ex Exchanger, host string) (ips []net.IP, err error) {
        mq := dns.Msg{}
        mq.SetQuestion(dns.Fqdn(host), dns.TypeA) mq.SetQuestion(dns.Fqdn(host), dns.TypeA)
        return r.resolveIPs(ctx, ex, mq) return r.resolveIPs(ctx, ex, &mq)
        }
        func (r *resolver) resolve6(ctx context.Context, ex Exchanger, host string) (ips []net.IP, err error) {
        mq := dns.Msg{}
        mq.SetQuestion(dns.Fqdn(host), dns.TypeAAAA)
        return r.resolveIPs(ctx, ex, &mq)
        } }
        func (r *resolver) resolveIPs(ctx context.Context, ex Exchanger, mq *dns.Msg) (ips []net.IP, err error) { func (r *resolver) resolveIPs(ctx context.Context, ex Exchanger, mq *dns.Msg) (ips []net.IP, err error) {
        ...@@ -709,7 +718,8 @@ func (ex *dnsExchanger) Exchange(ctx context.Context, query []byte) ([]byte, err ...@@ -709,7 +718,8 @@ func (ex *dnsExchanger) Exchange(ctx context.Context, query []byte) ([]byte, err
        defer c.Close() defer c.Close()
        conn := &dns.Conn{ conn := &dns.Conn{
        Conn: c, Conn: c,
        UDPSize: 1024,
        } }
        if _, err = conn.Write(query); err != nil { if _, err = conn.Write(query); err != nil {
        return nil, err return nil, err
        ......
        snap/snapcraft.yaml
        View file @ a9c28789
        ...@@ -7,6 +7,7 @@ description: | ...@@ -7,6 +7,7 @@ description: |
        Wiki: https://v2.gost.run Wiki: https://v2.gost.run
        icon: gost.png icon: gost.png
        website: https://v2.gost.run website: https://v2.gost.run
        license: MIT
        confinement: strict confinement: strict
        ......
        Markdown is supported
        0% or
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment