TRKJ/EdgeNode
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeNode.git synced 2025-11-07 18:50:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化代码

Browse Source
This commit is contained in:
GoEdgeLab
2023-06-18 10:01:22 +08:00
parent 53f0fec568
commit ff8400de0d
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
internal/nodes/client_conn.go
View File

@@ -32,7 +32,6 @@ type ClientConn struct {
isTLS bool isTLS bool
isHTTP bool isHTTP bool
isLn bool // 是否为Ln连接
hasRead bool hasRead bool
isLO bool // 是否为环路 isLO bool // 是否为环路
@@ -67,7 +66,9 @@ func NewClientConn(rawConn net.Conn, isHTTP bool, isTLS bool, isInAllowList bool
createdAt: fasttime.Now().Unix(), createdAt: fasttime.Now().Unix(),
} }
conn.isLn = existsLnNodeIP(conn.RawIP()) if existsLnNodeIP(conn.RawIP()) {
conn.SetIsPersistent(true)
}
// 超时等设置 // 超时等设置
var globalServerConfig = sharedNodeConfig.GlobalServerConfig var globalServerConfig = sharedNodeConfig.GlobalServerConfig
@@ -112,7 +113,7 @@ func (this *ClientConn) Read(b []byte) (n int, err error) {
} }
// 设置读超时时间 // 设置读超时时间
if !this.isLn && this.isHTTP && !this.isPersistent && !this.isShortReading && this.autoReadTimeout { if this.isHTTP && !this.isPersistent && !this.isShortReading && this.autoReadTimeout {
this.setHTTPReadTimeout() this.setHTTPReadTimeout()
} }
@@ -133,7 +134,7 @@ func (this *ClientConn) Read(b []byte) (n int, err error) {
} }
// 忽略白名单和局域网 // 忽略白名单和局域网
if !this.isLn && this.isHTTP && !this.isInAllowList && !utils.IsLocalIP(this.RawIP()) { if !this.isPersistent && this.isHTTP && !this.isInAllowList && !utils.IsLocalIP(this.RawIP()) {
// SYN Flood检测 // SYN Flood检测
if this.serverId == 0 || !this.hasResetSYNFlood { if this.serverId == 0 || !this.hasResetSYNFlood {
var synFloodConfig = sharedNodeConfig.SYNFloodConfig() var synFloodConfig = sharedNodeConfig.SYNFloodConfig()
@@ -169,8 +170,7 @@ func (this *ClientConn) Write(b []byte) (n int, err error) {
} }
// 设置写超时时间 // 设置写超时时间
if !this.isLn && this.autoWriteTimeout { if !this.isPersistent && this.autoWriteTimeout {
// TODO L2 -> L1 写入时不限制时间
var timeoutSeconds = len(b) / 1024 var timeoutSeconds = len(b) / 1024
if timeoutSeconds < 3 { if timeoutSeconds < 3 {
timeoutSeconds = 3 timeoutSeconds = 3
@@ -179,7 +179,7 @@ func (this *ClientConn) Write(b []byte) (n int, err error) {
} }
// 延长读超时时间 // 延长读超时时间
if !this.isLn && this.isHTTP && !this.isPersistent && this.autoReadTimeout { if this.isHTTP && !this.isPersistent && this.autoReadTimeout {
this.setHTTPReadTimeout() this.setHTTPReadTimeout()
} }
@@ -246,7 +246,7 @@ func (this *ClientConn) SetDeadline(t time.Time) error {
func (this *ClientConn) SetReadDeadline(t time.Time) error { func (this *ClientConn) SetReadDeadline(t time.Time) error {
// 如果开启了HTTP自动读超时选项，则自动控制超时时间 // 如果开启了HTTP自动读超时选项，则自动控制超时时间
if !this.isLn && this.isHTTP && !this.isPersistent && this.autoReadTimeout { if this.isHTTP && !this.isPersistent && this.autoReadTimeout {
this.isShortReading = false this.isShortReading = false
var unixTime = t.Unix() var unixTime = t.Unix()

11
internal/nodes/http_request.go
View File

@@ -480,6 +480,17 @@ func (this *HTTPRequest) configureWeb(web *serverconfigs.HTTPWebConfig, isTop bo
// remote addr // remote addr
if web.RemoteAddr != nil && (web.RemoteAddr.IsPrior || isTop) && web.RemoteAddr.IsOn { if web.RemoteAddr != nil && (web.RemoteAddr.IsPrior || isTop) && web.RemoteAddr.IsOn {
this.web.RemoteAddr = web.RemoteAddr this.web.RemoteAddr = web.RemoteAddr
// check if from proxy
if len(this.web.RemoteAddr.Value) > 0 && this.web.RemoteAddr.Value != "${rawRemoteAddr}" {
var requestConn = this.RawReq.Context().Value(HTTPConnContextKey)
if requestConn != nil {
requestClientConn, ok := requestConn.(ClientConnInterface)
if ok {
requestClientConn.SetIsPersistent(true)
}
}
}
} }
// charset // charset