TRKJ/EdgeNode
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeNode.git synced 2025-12-10 20:10:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复HTTP传输时可能无法传递TOA的问题

Browse Source
This commit is contained in:
GoEdgeLab
2023-07-23 18:49:50 +08:00
parent c2895a296c
commit 22a600dd0a
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/nodes/http_client_pool.go
View File

@@ -4,9 +4,11 @@ import (
"context" "context"
"crypto/tls" "crypto/tls"
"errors" "errors"
"github.com/TeaOSLab/EdgeCommon/pkg/configutils"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
"github.com/TeaOSLab/EdgeNode/internal/goman" "github.com/TeaOSLab/EdgeNode/internal/goman"
"github.com/TeaOSLab/EdgeNode/internal/remotelogs" "github.com/TeaOSLab/EdgeNode/internal/remotelogs"
"github.com/iwind/TeaGo/types"
"github.com/pires/go-proxyproto" "github.com/pires/go-proxyproto"
"golang.org/x/net/http2" "golang.org/x/net/http2"
"net" "net"
@@ -224,7 +226,7 @@ func (this *HTTPClientPool) handleTOA(req *HTTPRequest, ctx context.Context, net
for i := 1; i <= retries; i++ { for i := 1; i <= retries; i++ {
var port = int(toaConfig.RandLocalPort()) var port = int(toaConfig.RandLocalPort())
// TODO 思考是否支持X-Real-IP/X-Forwarded-IP // TODO 思考是否支持X-Real-IP/X-Forwarded-IP
err := sharedTOAManager.SendMsg("add:" + strconv.Itoa(port) + ":" + req.requestRemoteAddr(true)) err := sharedTOAManager.SendMsg("add:" + strconv.Itoa(port) + ":" + configutils.QuoteIP(req.requestRemoteAddr(true)) + ":" + types.String(req.RemotePort()))
if err != nil { if err != nil {
remotelogs.Error("TOA", "add failed: "+err.Error()) remotelogs.Error("TOA", "add failed: "+err.Error())
} else { } else {

4
internal/nodes/toa_manager.go
View File

@@ -60,14 +60,14 @@ func (this *TOAManager) Run(config *nodeconfigs.TOAConfig) error {
return nil return nil
} }
binPath := Tea.Root + "/edge-toa/edge-toa" // TODO 可以做成配置 var binPath = Tea.Root + "/edge-toa/edge-toa" // TODO 可以做成配置
_, err := os.Stat(binPath) _, err := os.Stat(binPath)
if err != nil { if err != nil {
return err return err
} }
remotelogs.Println("TOA", "starting ...") remotelogs.Println("TOA", "starting ...")
remotelogs.Println("TOA", "args: "+strings.Join(config.AsArgs(), " ")) remotelogs.Println("TOA", "args: "+strings.Join(config.AsArgs(), " "))
cmd := executils.NewCmd(binPath, config.AsArgs()...) var cmd = executils.NewCmd(binPath, config.AsArgs()...)
err = cmd.Start() err = cmd.Start()
if err != nil { if err != nil {
return err return err