Skip to content
This repository was archived by the owner on Feb 13, 2025. It is now read-only.

Commit f805a9f

Browse files
wwqgtxxwwqgtxx
committed
chore: cleaned up some weird code
1 parent eb985b0 commit f805a9f

17 files changed

+99
-126
lines changed

‎adapter/adapter.go

+10-7
Original file line numberDiff line numberDiff line change
@@ -164,13 +164,16 @@ func (p *Proxy) MarshalJSON() ([]byte, error) {
164164
mapping["name"] = p.Name()
165165
mapping["udp"] = p.SupportUDP()
166166
mapping["uot"] = p.SupportUOT()
167-
mapping["xudp"] = p.SupportXUDP()
168-
mapping["tfo"] = p.SupportTFO()
169-
mapping["mptcp"] = p.SupportMPTCP()
170-
mapping["smux"] = p.SupportSMUX()
171-
mapping["interface"] = p.SupportInterface()
172-
mapping["dialer-proxy"] = p.SupportDialerProxy()
173-
mapping["routing-mark"] = p.SupportRoutingMark()
167+
168+
proxyInfo := p.ProxyInfo()
169+
mapping["xudp"] = proxyInfo.XUDP
170+
mapping["tfo"] = proxyInfo.TFO
171+
mapping["mptcp"] = proxyInfo.MPTCP
172+
mapping["smux"] = proxyInfo.SMUX
173+
mapping["interface"] = proxyInfo.Interface
174+
mapping["dialer-proxy"] = proxyInfo.DialerProxy
175+
mapping["routing-mark"] = proxyInfo.RoutingMark
176+
174177
return json.Marshal(mapping)
175178
}
176179

‎adapter/outbound/base.go

+9-30
Original file line numberDiff line numberDiff line change
@@ -85,36 +85,15 @@ func (b *Base) SupportUDP() bool {
8585
return b.udp
8686
}
8787

88-
// SupportXUDP implements C.ProxyAdapter
89-
func (b *Base) SupportXUDP() bool {
90-
return b.xudp
91-
}
92-
93-
// SupportTFO implements C.ProxyAdapter
94-
func (b *Base) SupportTFO() bool {
95-
return b.tfo
96-
}
97-
98-
// SupportMPTCP implements C.ProxyAdapter
99-
func (b *Base) SupportMPTCP() bool {
100-
return b.mpTcp
101-
}
102-
103-
// SupportSMUX implements C.ProxyAdapter
104-
func (b *Base) SupportSMUX() bool {
105-
return false
106-
}
107-
108-
func (b *Base) SupportDialerProxy() string {
109-
return ""
110-
}
111-
112-
func (b *Base) SupportInterface() string {
113-
return b.iface
114-
}
115-
116-
func (b *Base) SupportRoutingMark() int {
117-
return b.rmark
88+
// ProxyInfo implements C.ProxyAdapter
89+
func (b *Base) ProxyInfo() (info C.ProxyInfo) {
90+
info.XUDP = b.xudp
91+
info.TFO = b.tfo
92+
info.MPTCP = b.mpTcp
93+
info.SMUX = false
94+
info.Interface = b.iface
95+
info.RoutingMark = b.rmark
96+
return
11897
}
11998

12099
// IsL3Protocol implements C.ProxyAdapter

‎adapter/outbound/http.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,11 @@ func (h *Http) SupportWithDialer() C.NetWork {
9292
return C.TCP
9393
}
9494

95-
// SupportDialerProxy implements C.ProxyAdapter
96-
func (h *Http) SupportDialerProxy() string {
97-
return h.option.DialerProxy
95+
// ProxyInfo implements C.ProxyAdapter
96+
func (h *Http) ProxyInfo() C.ProxyInfo {
97+
info := h.Base.ProxyInfo()
98+
info.DialerProxy = h.option.DialerProxy
99+
return info
98100
}
99101

100102
func (h *Http) shakeHand(metadata *C.Metadata, rw io.ReadWriter) error {

‎adapter/outbound/hysteria.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,11 @@ func (h *Hysteria) genHdc(ctx context.Context, opts ...dialer.Option) utils.Pack
8787
}
8888
}
8989

90-
// SupportDialerProxy implements C.ProxyAdapter
91-
func (h *Hysteria) SupportDialerProxy() string {
92-
return h.option.DialerProxy
90+
// ProxyInfo implements C.ProxyAdapter
91+
func (h *Hysteria) ProxyInfo() C.ProxyInfo {
92+
info := h.Base.ProxyInfo()
93+
info.DialerProxy = h.option.DialerProxy
94+
return info
9395
}
9496

9597
type HysteriaOption struct {

‎adapter/outbound/hysteria2.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,11 @@ func closeHysteria2(h *Hysteria2) {
9696
}
9797
}
9898

99-
// SupportDialerProxy implements C.ProxyAdapter
100-
func (h *Hysteria2) SupportDialerProxy() string {
101-
return h.option.DialerProxy
99+
// ProxyInfo implements C.ProxyAdapter
100+
func (h *Hysteria2) ProxyInfo() C.ProxyInfo {
101+
info := h.Base.ProxyInfo()
102+
info.DialerProxy = h.option.DialerProxy
103+
return info
102104
}
103105

104106
func NewHysteria2(option Hysteria2Option) (*Hysteria2, error) {

‎adapter/outbound/shadowsocks.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,11 @@ func (ss *ShadowSocks) SupportWithDialer() C.NetWork {
196196
return C.ALLNet
197197
}
198198

199-
// SupportDialerProxy implements C.ProxyAdapter
200-
func (ss *ShadowSocks) SupportDialerProxy() string {
201-
return ss.option.DialerProxy
199+
// ProxyInfo implements C.ProxyAdapter
200+
func (ss *ShadowSocks) ProxyInfo() C.ProxyInfo {
201+
info := ss.Base.ProxyInfo()
202+
info.DialerProxy = ss.option.DialerProxy
203+
return info
202204
}
203205

204206
// ListenPacketOnStreamConn implements C.ProxyAdapter

‎adapter/outbound/shadowsocksr.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,11 @@ func (ssr *ShadowSocksR) SupportWithDialer() C.NetWork {
122122
return C.ALLNet
123123
}
124124

125-
// SupportDialerProxy implements C.ProxyAdapter
126-
func (ssr *ShadowSocksR) SupportDialerProxy() string {
127-
return ssr.option.DialerProxy
125+
// ProxyInfo implements C.ProxyAdapter
126+
func (ssr *ShadowSocksR) ProxyInfo() C.ProxyInfo {
127+
info := ssr.Base.ProxyInfo()
128+
info.DialerProxy = ssr.option.DialerProxy
129+
return info
128130
}
129131

130132
func NewShadowSocksR(option ShadowSocksROption) (*ShadowSocksR, error) {

‎adapter/outbound/singmux.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,10 @@ func (s *SingMux) SupportUOT() bool {
9797
return true
9898
}
9999

100-
func (s *SingMux) SupportSMUX() bool {
101-
return true
100+
func (s *SingMux) ProxyInfo() C.ProxyInfo {
101+
info := s.ProxyAdapter.ProxyInfo()
102+
info.SMUX = true
103+
return info
102104
}
103105

104106
func closeSingMux(s *SingMux) {

‎adapter/outbound/snell.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,11 @@ func (s *Snell) SupportUOT() bool {
141141
return true
142142
}
143143

144-
// SupportDialerProxy implements C.ProxyAdapter
145-
func (s *Snell) SupportDialerProxy() string {
146-
return s.option.DialerProxy
144+
// ProxyInfo implements C.ProxyAdapter
145+
func (s *Snell) ProxyInfo() C.ProxyInfo {
146+
info := s.Base.ProxyInfo()
147+
info.DialerProxy = s.option.DialerProxy
148+
return info
147149
}
148150

149151
func NewSnell(option SnellOption) (*Snell, error) {

‎adapter/outbound/socks5.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,11 @@ func (ss *Socks5) ListenPacketContext(ctx context.Context, metadata *C.Metadata,
171171
return newPacketConn(&socksPacketConn{PacketConn: pc, rAddr: bindUDPAddr, tcpConn: c}, ss), nil
172172
}
173173

174-
// SupportDialerProxy implements C.ProxyAdapter
175-
func (ss *Socks5) SupportDialerProxy() string {
176-
return ss.option.DialerProxy
174+
// ProxyInfo implements C.ProxyAdapter
175+
func (ss *Socks5) ProxyInfo() C.ProxyInfo {
176+
info := ss.Base.ProxyInfo()
177+
info.DialerProxy = ss.option.DialerProxy
178+
return info
177179
}
178180

179181
func NewSocks5(option Socks5Option) (*Socks5, error) {

‎adapter/outbound/ssh.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,11 @@ func closeSsh(s *Ssh) {
121121
_ = s.client.Close()
122122
}
123123

124-
// SupportWithDialer implements C.ProxyAdapter
125-
func (s *Ssh) SupportDialerProxy() string {
126-
return s.option.DialerProxy
124+
// ProxyInfo implements C.ProxyAdapter
125+
func (s *Ssh) ProxyInfo() C.ProxyInfo {
126+
info := s.Base.ProxyInfo()
127+
info.DialerProxy = s.option.DialerProxy
128+
return info
127129
}
128130

129131
func NewSsh(option SshOption) (*Ssh, error) {

‎adapter/outbound/trojan.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,11 @@ func (t *Trojan) SupportUOT() bool {
244244
return true
245245
}
246246

247-
// SupportDialerProxy implements C.ProxyAdapter
248-
func (t *Trojan) SupportDialerProxy() string {
249-
return t.option.DialerProxy
247+
// ProxyInfo implements C.ProxyAdapter
248+
func (t *Trojan) ProxyInfo() C.ProxyInfo {
249+
info := t.Base.ProxyInfo()
250+
info.DialerProxy = t.option.DialerProxy
251+
return info
250252
}
251253

252254
func NewTrojan(option TrojanOption) (*Trojan, error) {

‎adapter/outbound/tuic.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,11 @@ func (t *Tuic) dialWithDialer(ctx context.Context, dialer C.Dialer) (transport *
146146
return
147147
}
148148

149-
// SupportDialerProxy implements C.ProxyAdapter
150-
func (t *Tuic) SupportDialerProxy() string {
151-
return t.option.DialerProxy
149+
// ProxyInfo implements C.ProxyAdapter
150+
func (t *Tuic) ProxyInfo() C.ProxyInfo {
151+
info := t.Base.ProxyInfo()
152+
info.DialerProxy = t.option.DialerProxy
153+
return info
152154
}
153155

154156
func NewTuic(option TuicOption) (*Tuic, error) {

‎adapter/outbound/vless.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -379,9 +379,11 @@ func (v *Vless) SupportUOT() bool {
379379
return true
380380
}
381381

382-
// SupportDialerProxy implements C.ProxyAdapter
383-
func (v *Vless) SupportDialerProxy() string {
384-
return v.option.DialerProxy
382+
// ProxyInfo implements C.ProxyAdapter
383+
func (v *Vless) ProxyInfo() C.ProxyInfo {
384+
info := v.Base.ProxyInfo()
385+
info.DialerProxy = v.option.DialerProxy
386+
return info
385387
}
386388

387389
func parseVlessAddr(metadata *C.Metadata, xudp bool) *vless.DstAddr {

‎adapter/outbound/vmess.go

+5-2
Original file line numberDiff line numberDiff line change
@@ -388,8 +388,11 @@ func (v *Vmess) SupportWithDialer() C.NetWork {
388388
return C.ALLNet
389389
}
390390

391-
func (v *Vmess) SupportDialerProxy() string {
392-
return v.option.DialerProxy
391+
// ProxyInfo implements C.ProxyAdapter
392+
func (v *Vmess) ProxyInfo() C.ProxyInfo {
393+
info := v.Base.ProxyInfo()
394+
info.DialerProxy = v.option.DialerProxy
395+
return info
393396
}
394397

395398
// ListenPacketOnStreamConn implements C.ProxyAdapter

‎adapter/outbound/wireguard.go

+3-45
Original file line numberDiff line numberDiff line change
@@ -611,32 +611,11 @@ func (r *refProxyAdapter) SupportUDP() bool {
611611
return false
612612
}
613613

614-
func (r *refProxyAdapter) SupportXUDP() bool {
614+
func (r *refProxyAdapter) ProxyInfo() C.ProxyInfo {
615615
if r.proxyAdapter != nil {
616-
return r.proxyAdapter.SupportXUDP()
616+
return r.proxyAdapter.ProxyInfo()
617617
}
618-
return false
619-
}
620-
621-
func (r *refProxyAdapter) SupportTFO() bool {
622-
if r.proxyAdapter != nil {
623-
return r.proxyAdapter.SupportTFO()
624-
}
625-
return false
626-
}
627-
628-
func (r *refProxyAdapter) SupportMPTCP() bool {
629-
if r.proxyAdapter != nil {
630-
return r.proxyAdapter.SupportMPTCP()
631-
}
632-
return false
633-
}
634-
635-
func (r *refProxyAdapter) SupportSMUX() bool {
636-
if r.proxyAdapter != nil {
637-
return r.proxyAdapter.SupportSMUX()
638-
}
639-
return false
618+
return C.ProxyInfo{}
640619
}
641620

642621
func (r *refProxyAdapter) MarshalJSON() ([]byte, error) {
@@ -674,27 +653,6 @@ func (r *refProxyAdapter) SupportUOT() bool {
674653
return false
675654
}
676655

677-
func (r *refProxyAdapter) SupportDialerProxy() string {
678-
if r.proxyAdapter != nil {
679-
return r.proxyAdapter.SupportDialerProxy()
680-
}
681-
return ""
682-
}
683-
684-
func (r *refProxyAdapter) SupportInterface() string {
685-
if r.proxyAdapter != nil {
686-
return r.proxyAdapter.SupportInterface()
687-
}
688-
return ""
689-
}
690-
691-
func (r *refProxyAdapter) SupportRoutingMark() int {
692-
if r.proxyAdapter != nil {
693-
return r.proxyAdapter.SupportRoutingMark()
694-
}
695-
return 0
696-
}
697-
698656
func (r *refProxyAdapter) SupportWithDialer() C.NetWork {
699657
if r.proxyAdapter != nil {
700658
return r.proxyAdapter.SupportWithDialer()

‎constant/adapters.go

+13-7
Original file line numberDiff line numberDiff line change
@@ -99,18 +99,24 @@ type Dialer interface {
9999
ListenPacket(ctx context.Context, network, address string, rAddrPort netip.AddrPort) (net.PacketConn, error)
100100
}
101101

102+
type ProxyInfo struct {
103+
XUDP bool
104+
TFO bool
105+
MPTCP bool
106+
SMUX bool
107+
Interface string
108+
RoutingMark int
109+
DialerProxy string
110+
}
111+
102112
type ProxyAdapter interface {
103113
Name() string
104114
Type() AdapterType
105115
Addr() string
106116
SupportUDP() bool
107-
SupportXUDP() bool
108-
SupportTFO() bool
109-
SupportMPTCP() bool
110-
SupportSMUX() bool
111-
SupportInterface() string
112-
SupportRoutingMark() int
113-
SupportDialerProxy() string
117+
118+
// ProxyInfo contains some extra information maybe useful for MarshalJSON
119+
ProxyInfo() ProxyInfo
114120
MarshalJSON() ([]byte, error)
115121

116122
// Deprecated: use DialContextWithDialer and ListenPacketWithDialer instead.

0 commit comments

Comments
 (0)