xmengnet/mihomo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: proxyDialer can add inner conn to statistic

Browse source
This commit is contained in:
wwqgtxx 2023-04-11 21:42:16 +08:00
parent 90f95d7c78
commit 7beb09153e
2 changed files with 42 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
adapter/outboundgroup/relay.go
View file

@ -27,7 +27,7 @@ func (r *Relay) DialContext(ctx context.Context, metadata *C.Metadata, opts ...d
var d C.Dialer var d C.Dialer
d = dialer.NewDialer(r.Base.DialOptions(opts...)...) d = dialer.NewDialer(r.Base.DialOptions(opts...)...)
for _, proxy := range proxies[:len(proxies)-1] { for _, proxy := range proxies[:len(proxies)-1] {
d = proxydialer.New(proxy, d) d = proxydialer.New(proxy, d, false)
} }
last := proxies[len(proxies)-1] last := proxies[len(proxies)-1]
conn, err := last.DialContextWithDialer(ctx, d, metadata) conn, err := last.DialContextWithDialer(ctx, d, metadata)
@ -58,7 +58,7 @@ func (r *Relay) ListenPacketContext(ctx context.Context, metadata *C.Metadata, o
var d C.Dialer var d C.Dialer
d = dialer.NewDialer(r.Base.DialOptions(opts...)...) d = dialer.NewDialer(r.Base.DialOptions(opts...)...)
for _, proxy := range proxies[:len(proxies)-1] { for _, proxy := range proxies[:len(proxies)-1] {
d = proxydialer.New(proxy, d) d = proxydialer.New(proxy, d, false)
} }
last := proxies[len(proxies)-1] last := proxies[len(proxies)-1]
pc, err := last.ListenPacketWithDialer(ctx, d, metadata) pc, err := last.ListenPacketWithDialer(ctx, d, metadata)

44
component/proxydialer/proxydialer.go
View file

@ -11,21 +11,23 @@ import (
"github.com/Dreamacro/clash/component/dialer" "github.com/Dreamacro/clash/component/dialer"
C "github.com/Dreamacro/clash/constant" C "github.com/Dreamacro/clash/constant"
"github.com/Dreamacro/clash/tunnel" "github.com/Dreamacro/clash/tunnel"
"github.com/Dreamacro/clash/tunnel/statistic"
) )
type proxyDialer struct { type proxyDialer struct {
proxy C.ProxyAdapter proxy C.ProxyAdapter
dialer C.Dialer dialer C.Dialer
statistic bool
} }
func New(proxy C.ProxyAdapter, dialer C.Dialer) C.Dialer { func New(proxy C.ProxyAdapter, dialer C.Dialer, statistic bool) C.Dialer {
return proxyDialer{proxy: proxy, dialer: dialer} return proxyDialer{proxy: proxy, dialer: dialer, statistic: statistic}
} }
func NewByName(proxyName string, dialer C.Dialer) (C.Dialer, error) { func NewByName(proxyName string, dialer C.Dialer) (C.Dialer, error) {
proxies := tunnel.Proxies() proxies := tunnel.Proxies()
if proxy, ok := proxies[proxyName]; ok { if proxy, ok := proxies[proxyName]; ok {
return New(proxy, dialer), nil return New(proxy, dialer, true), nil
} }
return nil, fmt.Errorf("proxyName[%s] not found", proxyName) return nil, fmt.Errorf("proxyName[%s] not found", proxyName)
} }
@ -42,17 +44,29 @@ func (p proxyDialer) DialContext(ctx context.Context, network, address string) (
} }
return N.NewBindPacketConn(pc, currentMeta.UDPAddr()), nil return N.NewBindPacketConn(pc, currentMeta.UDPAddr()), nil
} }
var conn C.Conn
switch p.proxy.SupportWithDialer() { switch p.proxy.SupportWithDialer() {
case C.ALLNet: case C.ALLNet:
fallthrough fallthrough
case C.TCP: case C.TCP:
return p.proxy.DialContextWithDialer(ctx, p.dialer, currentMeta) conn, err = p.proxy.DialContextWithDialer(ctx, p.dialer, currentMeta)
if err != nil {
return nil, err
}
default: // fallback to old function default: // fallback to old function
if d, ok := p.dialer.(dialer.Dialer); ok { // fallback to old function if d, ok := p.dialer.(dialer.Dialer); ok { // fallback to old function
return p.proxy.DialContext(ctx, currentMeta, dialer.WithOption(d.Opt)) conn, err = p.proxy.DialContext(ctx, currentMeta, dialer.WithOption(d.Opt))
if err != nil {
return nil, err
} }
} else {
return nil, C.ErrNotSupport return nil, C.ErrNotSupport
} }
}
if p.statistic {
conn = statistic.NewTCPTracker(conn, statistic.DefaultManager, currentMeta, nil, 0, 0)
}
return conn, err
} }
func (p proxyDialer) ListenPacket(ctx context.Context, network, address string, rAddrPort netip.AddrPort) (net.PacketConn, error) { func (p proxyDialer) ListenPacket(ctx context.Context, network, address string, rAddrPort netip.AddrPort) (net.PacketConn, error) {
@ -63,19 +77,32 @@ func (p proxyDialer) ListenPacket(ctx context.Context, network, address string,
return p.listenPacket(ctx, currentMeta) return p.listenPacket(ctx, currentMeta)
} }
func (p proxyDialer) listenPacket(ctx context.Context, currentMeta *C.Metadata) (net.PacketConn, error) { func (p proxyDialer) listenPacket(ctx context.Context, currentMeta *C.Metadata) (C.PacketConn, error) {
var pc C.PacketConn
var err error
currentMeta.NetWork = C.UDP currentMeta.NetWork = C.UDP
switch p.proxy.SupportWithDialer() { switch p.proxy.SupportWithDialer() {
case C.ALLNet: case C.ALLNet:
fallthrough fallthrough
case C.UDP: case C.UDP:
return p.proxy.ListenPacketWithDialer(ctx, p.dialer, currentMeta) pc, err = p.proxy.ListenPacketWithDialer(ctx, p.dialer, currentMeta)
if err != nil {
return nil, err
}
default: // fallback to old function default: // fallback to old function
if d, ok := p.dialer.(dialer.Dialer); ok { // fallback to old function if d, ok := p.dialer.(dialer.Dialer); ok { // fallback to old function
return p.proxy.ListenPacketContext(ctx, currentMeta, dialer.WithOption(d.Opt)) pc, err = p.proxy.ListenPacketContext(ctx, currentMeta, dialer.WithOption(d.Opt))
if err != nil {
return nil, err
} }
} else {
return nil, C.ErrNotSupport return nil, C.ErrNotSupport
} }
}
if p.statistic {
pc = statistic.NewUDPTracker(pc, statistic.DefaultManager, currentMeta, nil, 0, 0)
}
return pc, nil
} }
func addrToMetadata(rawAddress string) (addr *C.Metadata, err error) { func addrToMetadata(rawAddress string) (addr *C.Metadata, err error) {
@ -97,6 +124,7 @@ func addrToMetadata(rawAddress string) (addr *C.Metadata, err error) {
DstPort: port, DstPort: port,
} }
} }
addr.Type = C.INNER
return return
} }