Browse Source

move non-VMessAEAD warning to startup

kslr 4 years ago
parent
commit
e87e3d6b85
2 changed files with 1 additions and 1 deletions
  1. 0 1
      proxy/vmess/encoding/server.go
  2. 1 0
      v2ray.go

+ 0 - 1
proxy/vmess/encoding/server.go

@@ -199,7 +199,6 @@ func (s *ServerSession) DecodeRequestHeader(reader io.Reader) (*protocol.Request
 		if s.isAEADForced {
 		if s.isAEADForced {
 			return nil, drainConnection(newError("invalid user: VMessAEAD is enforced and a non VMessAEAD connection is received. You can still disable this security feature with environment variable v2ray.vmess.aead.forced = false . You will not be able to enable legacy header workaround in the future."))
 			return nil, drainConnection(newError("invalid user: VMessAEAD is enforced and a non VMessAEAD connection is received. You can still disable this security feature with environment variable v2ray.vmess.aead.forced = false . You will not be able to enable legacy header workaround in the future."))
 		}
 		}
-		newError("Critical Warning: potentially invalid user: a non VMessAEAD connection is received. From 2022 Jan 1st, this kind of connection will be rejected by default. You should update or replace your client software now. ").AtWarning().WriteToLog()
 		user = userLegacy
 		user = userLegacy
 		iv := hashTimestamp(md5.New(), timestamp)
 		iv := hashTimestamp(md5.New(), timestamp)
 		vmessAccount = userLegacy.Account.(*vmess.MemoryAccount)
 		vmessAccount = userLegacy.Account.(*vmess.MemoryAccount)

+ 1 - 0
v2ray.go

@@ -340,6 +340,7 @@ func (s *Instance) Start() error {
 	}
 	}
 
 
 	newError("V2Ray ", Version(), " started").AtWarning().WriteToLog()
 	newError("V2Ray ", Version(), " started").AtWarning().WriteToLog()
+	newError("Starting 2022, non-VMessAEAD connections will be rejected by default.").AtWarning().WriteToLog()
 
 
 	return nil
 	return nil
 }
 }