go-gost/x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update chain route

Browse Source
This commit is contained in:
ginuerzh
2022-09-20 11:48:51 +08:00
parent 01d7dc77c6
commit 1a1c038fd7
27 changed files with 565 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
handler/dns/handler.go
View File

@ -14,6 +14,7 @@ import (
"github.com/go-gost/core/hosts"
"github.com/go-gost/core/logger"
md "github.com/go-gost/core/metadata"
xchain "github.com/go-gost/x/chain"
resolver_util "github.com/go-gost/x/internal/util/resolver"
"github.com/go-gost/x/registry"
"github.com/go-gost/x/resolver/exchanger"
@ -29,11 +30,11 @@ func init() {
}
type dnsHandler struct {
group *chain.NodeGroup
hop chain.Hop
exchangers map[string]exchanger.Exchanger
cache *resolver_util.Cache
router *chain.Router
hosts hosts.HostMapper
hostMapper hosts.HostMapper
md metadata
options handler.Options
}
@ -60,21 +61,19 @@ func (h *dnsHandler) Init(md md.Metadata) (err error) {
h.router = h.options.Router
if h.router == nil {
h.router = (&chain.Router{}).WithLogger(log)
h.router = chain.NewRouter(chain.LoggerRouterOption(log))
}
h.hosts = h.router.Hosts()
h.hostMapper = h.router.Options().HostMapper
if h.group == nil {
h.group = &chain.NodeGroup{}
if h.hop == nil {
var nodes []*chain.Node
for i, addr := range h.md.dns {
addr = strings.TrimSpace(addr)
if addr == "" {
continue
}
h.group.AddNode(chain.NewNode(fmt.Sprintf("target-%d", i), addr))
nodes = append(nodes, chain.NewNode(fmt.Sprintf("target-%d", i), addr))
}
h.hop = xchain.NewChainHop(nodes)
}
for _, node := range h.group.Nodes() {
for _, node := range h.hop.Nodes() {
addr := strings.TrimSpace(node.Addr)
if addr == "" {
continue
@ -99,7 +98,7 @@ func (h *dnsHandler) Init(md md.Metadata) (err error) {
exchanger.TimeoutOption(h.md.timeout),
exchanger.LoggerOption(log),
)
log.Warnf("resolver not found, default to %s", defaultNameserver)
log.Warnf("resolver not found, use default %s", defaultNameserver)
if err != nil {
return err
}
@ -110,8 +109,8 @@ func (h *dnsHandler) Init(md md.Metadata) (err error) {
}
// Forward implements handler.Forwarder.
func (h *dnsHandler) Forward(group *chain.NodeGroup) {
h.group = group
func (h *dnsHandler) Forward(hop chain.Hop) {
h.hop = hop
}
func (h *dnsHandler) Handle(ctx context.Context, conn net.Conn, opts ...handler.HandleOption) error {
@ -261,7 +260,7 @@ func (h *dnsHandler) exchange(ctx context.Context, msg []byte, log logger.Logger
// lookup host mapper
func (h *dnsHandler) lookupHosts(r *dns.Msg, log logger.Logger) (m *dns.Msg) {
if h.hosts == nil ||
if h.hostMapper == nil ||
r.Question[0].Qclass != dns.ClassINET ||
(r.Question[0].Qtype != dns.TypeA && r.Question[0].Qtype != dns.TypeAAAA) {
return nil
@ -274,7 +273,7 @@ func (h *dnsHandler) lookupHosts(r *dns.Msg, log logger.Logger) (m *dns.Msg) {
switch r.Question[0].Qtype {
case dns.TypeA:
ips, _ := h.hosts.Lookup("ip4", host)
ips, _ := h.hostMapper.Lookup("ip4", host)
if len(ips) == 0 {
return nil
}
@ -290,7 +289,7 @@ func (h *dnsHandler) lookupHosts(r *dns.Msg, log logger.Logger) (m *dns.Msg) {
}
case dns.TypeAAAA:
ips, _ := h.hosts.Lookup("ip6", host)
ips, _ := h.hostMapper.Lookup("ip6", host)
if len(ips) == 0 {
return nil
}
@ -310,10 +309,10 @@ func (h *dnsHandler) lookupHosts(r *dns.Msg, log logger.Logger) (m *dns.Msg) {
}
func (h *dnsHandler) selectExchanger(ctx context.Context, addr string) exchanger.Exchanger {
if h.group == nil {
if h.hop == nil {
return nil
}
node := h.group.FilterAddr(addr).Next(ctx)
node := h.hop.Select(ctx, chain.AddrSelectOption(addr))
if node == nil {
return nil
}

17
handler/forward/local/handler.go
View File

@ -10,6 +10,7 @@ import (
"github.com/go-gost/core/chain"
"github.com/go-gost/core/handler"
md "github.com/go-gost/core/metadata"
xchain "github.com/go-gost/x/chain"
netpkg "github.com/go-gost/x/internal/net"
"github.com/go-gost/x/registry"
)
@ -21,7 +22,7 @@ func init() {
}
type forwardHandler struct {
group *chain.NodeGroup
hop chain.Hop
router *chain.Router
md metadata
options handler.Options
@ -43,22 +44,24 @@ func (h *forwardHandler) Init(md md.Metadata) (err error) {
return
}
if h.group == nil {
if h.hop == nil {
// dummy node used by relay connector.
h.group = chain.NewNodeGroup(&chain.Node{Name: "dummy", Addr: ":0"})
h.hop = xchain.NewChainHop([]*chain.Node{
{Name: "dummy", Addr: ":0"},
})
}
h.router = h.options.Router
if h.router == nil {
h.router = (&chain.Router{}).WithLogger(h.options.Logger)
h.router = chain.NewRouter(chain.LoggerRouterOption(h.options.Logger))
}
return
}
// Forward implements handler.Forwarder.
func (h *forwardHandler) Forward(group *chain.NodeGroup) {
h.group = group
func (h *forwardHandler) Forward(hop chain.Hop) {
h.hop = hop
}
func (h *forwardHandler) Handle(ctx context.Context, conn net.Conn, opts ...handler.HandleOption) error {
@ -81,7 +84,7 @@ func (h *forwardHandler) Handle(ctx context.Context, conn net.Conn, opts ...hand
return nil
}
target := h.group.Next(ctx)
target := h.hop.Select(ctx)
if target == nil {
err := errors.New("target not available")
log.Error(err)

13
handler/forward/remote/handler.go
View File

@ -20,7 +20,7 @@ func init() {
}
type forwardHandler struct {
group *chain.NodeGroup
hop chain.Hop
router *chain.Router
md metadata
options handler.Options
@ -44,15 +44,15 @@ func (h *forwardHandler) Init(md md.Metadata) (err error) {
h.router = h.options.Router
if h.router == nil {
h.router = (&chain.Router{}).WithLogger(h.options.Logger)
h.router = chain.NewRouter(chain.LoggerRouterOption(h.options.Logger))
}
return
}
// Forward implements handler.Forwarder.
func (h *forwardHandler) Forward(group *chain.NodeGroup) {
h.group = group
func (h *forwardHandler) Forward(hop chain.Hop) {
h.hop = hop
}
func (h *forwardHandler) Handle(ctx context.Context, conn net.Conn, opts ...handler.HandleOption) error {
@ -75,7 +75,10 @@ func (h *forwardHandler) Handle(ctx context.Context, conn net.Conn, opts ...hand
return nil
}
target := h.group.Next(ctx)
var target *chain.Node
if h.hop != nil {
target = h.hop.Select(ctx)
}
if target == nil {
err := errors.New("target not available")
log.Error(err)

2
handler/http/handler.go
View File

@ -52,7 +52,7 @@ func (h *httpHandler) Init(md md.Metadata) error {
h.router = h.options.Router
if h.router == nil {
h.router = (&chain.Router{}).WithLogger(h.options.Logger)
h.router = chain.NewRouter(chain.LoggerRouterOption(h.options.Logger))
}
return nil

2
handler/http2/handler.go
View File

@ -54,7 +54,7 @@ func (h *http2Handler) Init(md md.Metadata) error {
h.router = h.options.Router
if h.router == nil {
h.router = (&chain.Router{}).WithLogger(h.options.Logger)
h.router = chain.NewRouter(chain.LoggerRouterOption(h.options.Logger))
}
return nil

2
handler/redirect/tcp/handler.go
View File

@ -52,7 +52,7 @@ func (h *redirectHandler) Init(md md.Metadata) (err error) {
h.router = h.options.Router
if h.router == nil {
h.router = (&chain.Router{}).WithLogger(h.options.Logger)
h.router = chain.NewRouter(chain.LoggerRouterOption(h.options.Logger))
}
return

2
handler/redirect/udp/handler.go
View File

@ -41,7 +41,7 @@ func (h *redirectHandler) Init(md md.Metadata) (err error) {
h.router = h.options.Router
if h.router == nil {
h.router = (&chain.Router{}).WithLogger(h.options.Logger)
h.router = chain.NewRouter(chain.LoggerRouterOption(h.options.Logger))
}
return

2
handler/relay/forward.go
View File

@ -17,7 +17,7 @@ func (h *relayHandler) handleForward(ctx context.Context, conn net.Conn, network
Version: relay.Version1,
Status: relay.StatusOK,
}
target := h.group.Next(ctx)
target := h.hop.Select(ctx)
if target == nil {
resp.Status = relay.StatusServiceUnavailable
resp.WriteTo(conn)

10
handler/relay/handler.go
View File

@ -24,7 +24,7 @@ func init() {
}
type relayHandler struct {
group *chain.NodeGroup
hop chain.Hop
router *chain.Router
md metadata
options handler.Options
@ -48,15 +48,15 @@ func (h *relayHandler) Init(md md.Metadata) (err error) {
h.router = h.options.Router
if h.router == nil {
h.router = (&chain.Router{}).WithLogger(h.options.Logger)
h.router = chain.NewRouter(chain.LoggerRouterOption(h.options.Logger))
}
return nil
}
// Forward implements handler.Forwarder.
func (h *relayHandler) Forward(group *chain.NodeGroup) {
h.group = group
func (h *relayHandler) Forward(hop chain.Hop) {
h.hop = hop
}
func (h *relayHandler) Handle(ctx context.Context, conn net.Conn, opts ...handler.HandleOption) error {
@ -130,7 +130,7 @@ func (h *relayHandler) Handle(ctx context.Context, conn net.Conn, opts ...handle
network = "udp"
}
if h.group != nil {
if h.hop != nil {
if address != "" {
resp.Status = relay.StatusForbidden
log.Error("forward mode, connect is forbidden")

2
handler/sni/handler.go
View File

@ -54,7 +54,7 @@ func (h *sniHandler) Init(md md.Metadata) (err error) {
h.router = h.options.Router
if h.router == nil {
h.router = (&chain.Router{}).WithLogger(h.options.Logger)
h.router = chain.NewRouter(chain.LoggerRouterOption(h.options.Logger))
}
return nil

2
handler/socks/v4/handler.go
View File

@ -49,7 +49,7 @@ func (h *socks4Handler) Init(md md.Metadata) (err error) {
h.router = h.options.Router
if h.router == nil {
h.router = (&chain.Router{}).WithLogger(h.options.Logger)
h.router = chain.NewRouter(chain.LoggerRouterOption(h.options.Logger))
}
return nil

2
handler/socks/v5/handler.go
View File

@ -48,7 +48,7 @@ func (h *socks5Handler) Init(md md.Metadata) (err error) {
h.router = h.options.Router
if h.router == nil {
h.router = (&chain.Router{}).WithLogger(h.options.Logger)
h.router = chain.NewRouter(chain.LoggerRouterOption(h.options.Logger))
}
h.selector = &serverSelector{

2
handler/ss/handler.go
View File

@ -54,7 +54,7 @@ func (h *ssHandler) Init(md md.Metadata) (err error) {
h.router = h.options.Router
if h.router == nil {
h.router = (&chain.Router{}).WithLogger(h.options.Logger)
h.router = chain.NewRouter(chain.LoggerRouterOption(h.options.Logger))
}
return

2
handler/ss/udp/handler.go
View File

@ -55,7 +55,7 @@ func (h *ssuHandler) Init(md md.Metadata) (err error) {
h.router = h.options.Router
if h.router == nil {
h.router = (&chain.Router{}).WithLogger(h.options.Logger)
h.router = chain.NewRouter(chain.LoggerRouterOption(h.options.Logger))
}
return

2
handler/sshd/handler.go
View File

@ -52,7 +52,7 @@ func (h *forwardHandler) Init(md md.Metadata) (err error) {
h.router = h.options.Router
if h.router == nil {
h.router = (&chain.Router{}).WithLogger(h.options.Logger)
h.router = chain.NewRouter(chain.LoggerRouterOption(h.options.Logger))
}
return nil

13
handler/tap/handler.go
View File

@ -28,7 +28,7 @@ func init() {
}
type tapHandler struct {
group *chain.NodeGroup
hop chain.Hop
routes sync.Map
exit chan struct{}
cipher core.Cipher
@ -65,15 +65,15 @@ func (h *tapHandler) Init(md md.Metadata) (err error) {
h.router = h.options.Router
if h.router == nil {
h.router = (&chain.Router{}).WithLogger(h.options.Logger)
h.router = chain.NewRouter(chain.LoggerRouterOption(h.options.Logger))
}
return
}
// Forward implements handler.Forwarder.
func (h *tapHandler) Forward(group *chain.NodeGroup) {
h.group = group
func (h *tapHandler) Forward(hop chain.Hop) {
h.hop = hop
}
func (h *tapHandler) Handle(ctx context.Context, conn net.Conn, opts ...handler.HandleOption) error {
@ -105,7 +105,10 @@ func (h *tapHandler) Handle(ctx context.Context, conn net.Conn, opts ...handler.
var raddr net.Addr
var err error
target := h.group.Next(ctx)
var target *chain.Node
if h.hop != nil {
target = h.hop.Select(ctx)
}
if target != nil {
raddr, err = net.ResolveUDPAddr(network, target.Addr)
if err != nil {

13
handler/tun/handler.go
View File

@ -21,7 +21,7 @@ func init() {
}
type tunHandler struct {
group *chain.NodeGroup
hop chain.Hop
routes sync.Map
router *chain.Router
md metadata
@ -46,15 +46,15 @@ func (h *tunHandler) Init(md md.Metadata) (err error) {
h.router = h.options.Router
if h.router == nil {
h.router = (&chain.Router{}).WithLogger(h.options.Logger)
h.router = chain.NewRouter(chain.LoggerRouterOption(h.options.Logger))
}
return
}
// Forward implements handler.Forwarder.
func (h *tunHandler) Forward(group *chain.NodeGroup) {
h.group = group
func (h *tunHandler) Forward(hop chain.Hop) {
h.hop = hop
}
func (h *tunHandler) Handle(ctx context.Context, conn net.Conn, opts ...handler.HandleOption) error {
@ -87,7 +87,10 @@ func (h *tunHandler) Handle(ctx context.Context, conn net.Conn, opts ...handler.
var raddr net.Addr
var err error
target := h.group.Next(ctx)
var target *chain.Node
if h.hop != nil {
target = h.hop.Select(ctx)
}
if target != nil {
raddr, err = net.ResolveUDPAddr(network, target.Addr)
if err != nil {