history-museum/Clash.Meta
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: correct C.Metadata

Browse Source
This commit is contained in:
wwqgtxx
2022-12-04 22:08:20 +08:00
parent 62226e8b3d
commit 62474e0ed6
23 changed files with 161 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
listener/http/client.go
View File

@ -12,7 +12,7 @@ import (
"github.com/Dreamacro/clash/transport/socks5"
)
func newClient(source net.Addr,name,preferRulesName string, in chan<- C.ConnContext) *http.Client {
func newClient(source net.Addr, name, specialRules string, in chan<- C.ConnContext) *http.Client {
return &http.Client{
Transport: &http.Transport{
// from http.DefaultTransport
@ -32,7 +32,7 @@ func newClient(source net.Addr,name,preferRulesName string, in chan<- C.ConnCont
left, right := net.Pipe()
in <- inbound.NewHTTPWithInfos(dstAddr, source, right,name,preferRulesName)
in <- inbound.NewHTTPWithInfos(dstAddr, source, right, name, specialRules)
return left, nil
},

8
listener/http/proxy.go
View File

@ -14,8 +14,8 @@ import (
"github.com/Dreamacro/clash/log"
)
func HandleConn(name, preferRulesName string, c net.Conn, in chan<- C.ConnContext, cache *cache.LruCache[string, bool]) {
client := newClient(c.RemoteAddr(), name, preferRulesName, in)
func HandleConn(name, specialRules string, c net.Conn, in chan<- C.ConnContext, cache *cache.LruCache[string, bool]) {
client := newClient(c.RemoteAddr(), name, specialRules, in)
defer client.CloseIdleConnections()
conn := N.NewBufferedConn(c)
@ -48,7 +48,7 @@ func HandleConn(name, preferRulesName string, c net.Conn, in chan<- C.ConnContex
break // close connection
}
in <- inbound.NewHTTPSWithInfos(request, conn, name, preferRulesName)
in <- inbound.NewHTTPSWithInfos(request, conn, name, specialRules)
return // hijack connection
}
@ -61,7 +61,7 @@ func HandleConn(name, preferRulesName string, c net.Conn, in chan<- C.ConnContex
request.RequestURI = ""
if isUpgradeRequest(request) {
handleUpgrade(name, preferRulesName, conn, request, in)
handleUpgrade(name, specialRules, conn, request, in)
return // hijack connection
}

26
listener/http/server.go
View File

@ -9,11 +9,11 @@ import (
)
type Listener struct {
listener net.Listener
addr string
closed bool
name string
preferRulesName string
listener net.Listener
addr string
closed bool
name string
specialRules string
}
// RawAddress implements C.Listener
@ -36,11 +36,11 @@ func New(addr string, in chan<- C.ConnContext) (*Listener, error) {
return NewWithAuthenticate(addr, "DEFAULT-HTTP", "", in, true)
}
func NewWithInfos(addr, name, preferRulesName string, in chan<- C.ConnContext) (*Listener, error) {
return NewWithAuthenticate(addr, name, preferRulesName, in, true)
func NewWithInfos(addr, name, specialRules string, in chan<- C.ConnContext) (*Listener, error) {
return NewWithAuthenticate(addr, name, specialRules, in, true)
}
func NewWithAuthenticate(addr, name, preferRulesName string, in chan<- C.ConnContext, authenticate bool) (*Listener, error) {
func NewWithAuthenticate(addr, name, specialRules string, in chan<- C.ConnContext, authenticate bool) (*Listener, error) {
l, err := inbound.Listen("tcp", addr)
if err != nil {
@ -53,10 +53,10 @@ func NewWithAuthenticate(addr, name, preferRulesName string, in chan<- C.ConnCon
}
hl := &Listener{
listener: l,
name: name,
preferRulesName: preferRulesName,
addr: addr,
listener: l,
name: name,
specialRules: specialRules,
addr: addr,
}
go func() {
for {
@ -67,7 +67,7 @@ func NewWithAuthenticate(addr, name, preferRulesName string, in chan<- C.ConnCon
}
continue
}
go HandleConn(hl.name, hl.preferRulesName, conn, in, c)
go HandleConn(hl.name, hl.specialRules, conn, in, c)
}
}()

4
listener/http/upgrade.go
View File

@ -25,7 +25,7 @@ func isUpgradeRequest(req *http.Request) bool {
return false
}
func handleUpgrade(name,preferRulesName string,conn net.Conn, request *http.Request, in chan<- C.ConnContext) {
func handleUpgrade(name, specialRules string, conn net.Conn, request *http.Request, in chan<- C.ConnContext) {
defer conn.Close()
removeProxyHeaders(request.Header)
@ -43,7 +43,7 @@ func handleUpgrade(name,preferRulesName string,conn net.Conn, request *http.Requ
left, right := net.Pipe()
in <- inbound.NewHTTPWithInfos(dstAddr, conn.RemoteAddr(), right,name,preferRulesName)
in <- inbound.NewHTTPWithInfos(dstAddr, conn.RemoteAddr(), right, name, specialRules)
var bufferedLeft *N.BufferedConn
if request.TLS != nil {