github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove unnecessary debug info

pull/40/head
V2Ray 2015-10-05 16:57:58 +02:00
parent eb94f7a51c
commit 8461cde710
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
proxy/vmess/protocol/user/userset.go
View File

@ -5,7 +5,6 @@ import (
"time" "time"
"github.com/v2ray/v2ray-core/common/collect" "github.com/v2ray/v2ray-core/common/collect"
"github.com/v2ray/v2ray-core/common/log"
) )
const ( const (
@ -55,7 +54,6 @@ func (us *TimedUserSet) generateNewHashes(lastSec, nowSec int64, idx int, id ID)
idHash := NewTimeHash(HMACHash{}) idHash := NewTimeHash(HMACHash{})
for lastSec < nowSec+cacheDurationSec { for lastSec < nowSec+cacheDurationSec {
idHash := idHash.Hash(id.Bytes[:], lastSec) idHash := idHash.Hash(id.Bytes[:], lastSec)
log.Debug("Valid User Hash: %v", idHash)
us.access.Lock() us.access.Lock()
us.userHash[string(idHash)] = indexTimePair{idx, lastSec} us.userHash[string(idHash)] = indexTimePair{idx, lastSec}
us.access.Unlock() us.access.Unlock()

4
proxy/vmess/protocol/vmess.go
View File

@ -11,7 +11,6 @@ import (
"github.com/v2ray/v2ray-core/common/errors" "github.com/v2ray/v2ray-core/common/errors"
v2io "github.com/v2ray/v2ray-core/common/io" v2io "github.com/v2ray/v2ray-core/common/io"
"github.com/v2ray/v2ray-core/common/log"
v2net "github.com/v2ray/v2ray-core/common/net" v2net "github.com/v2ray/v2ray-core/common/net"
"github.com/v2ray/v2ray-core/proxy/vmess/protocol/user" "github.com/v2ray/v2ray-core/proxy/vmess/protocol/user"
) )
@ -72,8 +71,6 @@ func (r *VMessRequestReader) Read(reader io.Reader) (*VMessRequest, error) {
return nil, err return nil, err
} }
log.Debug("Read user hash: %v", buffer[:nBytes])
userId, timeSec, valid := r.vUserSet.GetUser(buffer[:nBytes]) userId, timeSec, valid := r.vUserSet.GetUser(buffer[:nBytes])
if !valid { if !valid {
return nil, errors.NewAuthenticationError(buffer[:nBytes]) return nil, errors.NewAuthenticationError(buffer[:nBytes])
@ -167,7 +164,6 @@ func (request *VMessRequest) ToBytes(idHash user.CounterHash, randomRangeInt64 u
counter := randomRangeInt64(time.Now().UTC().Unix(), 30) counter := randomRangeInt64(time.Now().UTC().Unix(), 30)
hash := idHash.Hash(request.UserId.Bytes[:], counter) hash := idHash.Hash(request.UserId.Bytes[:], counter)
log.Debug("Writing userhash: %v", hash)
buffer = append(buffer, hash...) buffer = append(buffer, hash...)
encryptionBegin := len(buffer) encryptionBegin := len(buffer)