dan9i10/xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2026-05-08 14:13:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use internal uuid package instead of external google/uuid

Browse Source 
Co-authored-by: RPRX <63339210+RPRX@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-02-04 22:13:04 +00:00
parent 8898a24b23
commit ee6f422148
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
go.mod
View File

@@ -8,7 +8,6 @@ require (
github.com/ghodss/yaml v1.0.1-0.20220118164431-d8423dcdf344
github.com/golang/mock v1.7.0-rc.1
github.com/google/go-cmp v0.7.0
github.com/google/uuid v1.6.0
github.com/gorilla/websocket v1.5.3
github.com/miekg/dns v1.1.72
github.com/pelletier/go-toml v1.9.5

7
transport/internet/xdrive/xdrive.go
View File

@@ -12,11 +12,11 @@ import (
"sync"
"time"
"github.com/google/uuid"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/common/signal/done"
"github.com/xtls/xray-core/common/uuid"
"github.com/xtls/xray-core/transport/internet"
"github.com/xtls/xray-core/transport/internet/stat"
)
@@ -148,7 +148,7 @@ func ParseFileName(name string) (sessionID string, direction string, seq int64,
sessionID = strings.Join(parts[:5], "-")
// Validate it's a UUID
if _, err := uuid.Parse(sessionID); err != nil {
if _, err := uuid.ParseString(sessionID); err != nil {
return "", "", 0, false
}
@@ -397,7 +397,8 @@ func Dial(ctx context.Context, dest net.Destination, streamSettings *internet.Me
}
// Generate a new session ID for this connection
sessionID := uuid.New().String()
newUUID := uuid.New()
sessionID := newUUID.String()
errors.LogInfo(ctx, fmt.Sprintf("XDRIVE client dialing with session %s to folder %s", sessionID, config.RemoteFolder))