File tree Expand file tree Collapse file tree 5 files changed +5
-3
lines changed
transport/internet/tlsmirror
httpenrollmentconfirmation
roundtripperenrollmentconfirmation Expand file tree Collapse file tree 5 files changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -123,7 +123,6 @@ func (c *EnrollmentConfirmationClient) init() error {
123123 enrollmentConfirmation , ok := enrollmentInst .(tlsmirror.ConnectionEnrollmentConfirmation )
124124 if ! ok {
125125 return newError ("bootstrap enrollment confirmation config is not a valid ConnectionEnrollmentConfirmation" )
126-
127126 }
128127
129128 if configReceiver , ok := enrollmentConfirmation .(tlsmirror.ConnectionEnrollmentConfirmationClientInstanceConfigReceiver ); ok {
Original file line number Diff line number Diff line change @@ -50,6 +50,7 @@ func (c *clientRoundtripper) IsCreatingSecondaryNewConnection() bool {
5050 c .pendingNewConnectionLock .RLock ()
5151 return c .pendingNewConnection >= 1
5252}
53+
5354func (c * clientRoundtripper ) RoundTrip (request * http.Request ) (* http.Response , error ) {
5455 if c .IsCreatingSecondaryNewConnection () {
5556 return nil , newError ("another connection is being established, cannot create a secondary connection" )
Original file line number Diff line number Diff line change @@ -118,7 +118,7 @@ func (c *Client) VerifyConnectionEnrollment(req *tlsmirror.EnrollmentConfirmatio
118118 if c .config .ServerIdentity != nil {
119119 connectionTagServerID = c .config .ServerIdentity
120120 }
121- connectionTag := append (connectionTagServerID , c .clientTemporaryIdentifier ... )
121+ connectionTag := append (connectionTagServerID , c .clientTemporaryIdentifier ... ) //nolint:gocritic
122122 wrappedData , err := proto .Marshal (req )
123123 if err != nil {
124124 return nil , newError ("failed to marshal enrollment confirmation request" ).Base (err )
Original file line number Diff line number Diff line change @@ -4,9 +4,10 @@ import (
44 "context"
55 "net"
66
7- "github.com/v2fly/v2ray-core/v5/common/serial"
87 "google.golang.org/protobuf/proto"
98
9+ "github.com/v2fly/v2ray-core/v5/common/serial"
10+
1011 "github.com/v2fly/v2ray-core/v5/common"
1112 "github.com/v2fly/v2ray-core/v5/common/environment"
1213 "github.com/v2fly/v2ray-core/v5/common/environment/envctx"
Original file line number Diff line number Diff line change 77 "time"
88
99 "github.com/golang/protobuf/proto"
10+
1011 "github.com/v2fly/v2ray-core/v5/transport/internet/tlsmirror/mirrorcommon"
1112
1213 core "github.com/v2fly/v2ray-core/v5"
You can’t perform that action at this time.
0 commit comments