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

format code

pull/182/head^2
V2Ray 2015-09-16 00:06:22 +02:00
parent 4c963a51ed
commit 54fe1ed8b1
10 changed files with 119 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
io/socks/socks.go
View File

@ -57,7 +57,7 @@ func ReadAuthentication(reader io.Reader) (auth Socks5AuthenticationRequest, err
return return
} }
if nBytes - 2 != int(auth.nMethods) { if nBytes-2 != int(auth.nMethods) {
err = fmt.Errorf("Unmatching number of auth methods, expecting %d, but got %d", auth.nMethods, nBytes) err = fmt.Errorf("Unmatching number of auth methods, expecting %d, but got %d", auth.nMethods, nBytes)
return return
} }

2
io/vmess/vmess_test.go
View File

@ -13,7 +13,7 @@ import (
) )
func TestVMessSerialization(t *testing.T) { func TestVMessSerialization(t *testing.T) {
t.Skip(); t.Skip()
assert := unit.Assert(t) assert := unit.Assert(t)
userId, err := core.NewID("2b2966ac-16aa-4fbf-8d81-c5f172a3da51") userId, err := core.NewID("2b2966ac-16aa-4fbf-8d81-c5f172a3da51")

2
net/socks/socks.go
View File

@ -95,7 +95,7 @@ func (server *SocksServer) HandleConnection(connection net.Conn) error {
return err return err
} }
status := byte(0) status := byte(0)
if ! upRequest.IsValid(server.config.Username, server.config.Password) { if !upRequest.IsValid(server.config.Username, server.config.Password) {
status = byte(0xFF) status = byte(0xFF)
} }
upResponse := socksio.NewSocks5UserPassResponse(status) upResponse := socksio.NewSocks5UserPassResponse(status)

4
userset.go
View File

@ -57,13 +57,13 @@ func (us *TimedUserSet) updateUserHash(tick <-chan time.Time) {
} }
} }
for lastSec < nowSec + cacheDurationSec { for lastSec < nowSec+cacheDurationSec {
for idx, id := range us.validUserIds { for idx, id := range us.validUserIds {
idHash := id.TimeHash(lastSec) idHash := id.TimeHash(lastSec)
hash2Remove <- hashEntry{string(idHash), lastSec} hash2Remove <- hashEntry{string(idHash), lastSec}
us.userHashes[string(idHash)] = indexTimePair{idx, lastSec} us.userHashes[string(idHash)] = indexTimePair{idx, lastSec}
} }
lastSec ++ lastSec++
} }
} }
} }