lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-09-28 06:46:14 -04:00
Code Issues Releases Wiki Activity

minor fix

Browse Source
This commit is contained in:
Darien Raymond 2016-01-21 16:29:18 +00:00
parent d8c6102638
commit d623b1809d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
proxy/vmess/command/accounts_test.go
View File

@ -31,6 +31,8 @@ func TestSwitchAccount(t *testing.T) {
cmd.Unmarshal(buffer.Bytes()) cmd.Unmarshal(buffer.Bytes())
sa2, ok := cmd.(*SwitchAccount) sa2, ok := cmd.(*SwitchAccount)
assert.Bool(ok).IsTrue() assert.Bool(ok).IsTrue()
assert.Pointer(sa.Host).IsNil()
assert.Pointer(sa2.Host).IsNil()
netassert.Port(sa.Port).Equals(sa2.Port) netassert.Port(sa.Port).Equals(sa2.Port)
assert.String(sa.ID).Equals(sa2.ID.String()) assert.String(sa.ID).Equals(sa2.ID.String())
assert.Uint16(sa.AlterIds.Value()).Equals(sa2.AlterIds.Value()) assert.Uint16(sa.AlterIds.Value()).Equals(sa2.AlterIds.Value())

3
proxy/vmess/inbound/command.go
View File

@ -16,11 +16,10 @@ func (this *VMessInboundHandler) generateCommand(buffer *alloc.Buffer) {
tag := this.features.Detour.ToTag tag := this.features.Detour.ToTag
if this.space.HasInboundHandlerManager() { if this.space.HasInboundHandlerManager() {
handlerManager := this.space.InboundHandlerManager() handlerManager := this.space.InboundHandlerManager()
handler, availableSec := handlerManager.GetHandler(tag) handler, availableMin := handlerManager.GetHandler(tag)
inboundHandler, ok := handler.(*VMessInboundHandler) inboundHandler, ok := handler.(*VMessInboundHandler)
if ok { if ok {
user := inboundHandler.GetUser() user := inboundHandler.GetUser()
availableMin := availableSec / 60
if availableMin > 255 { if availableMin > 255 {
availableMin = 255 availableMin = 255
} }